Clean-up

.gitignore

@@ -16,8 +16,6 @@ Encrypt/bin/
 Encrypt/obj/
 EventViewer/bin/
 EventViewer/obj/
-Events/bin/
-Events/obj/
 FeatureVectorCalculator/bin/
 FeatureVectorCalculator/obj/
 GemCard/bin/
@@ -46,6 +44,8 @@ ResultsBrowser/bin/
 ResultsBrowser/obj/
 ResultsParser/bin/
 ResultsParser/obj/
+S640TestApp/bin/
+S640TestApp/obj/
 SharedDatabase/bin
 SharedDatabase/obj
 SchematicDrawing/bin
@@ -58,8 +58,6 @@ ToFirstMonitor/bin/
 ToFirstMonitor/obj/
 ToSecondMonitor/bin/
 ToSecondMonitor/obj/
-Users/bin/
-Users/obj/
 UserManagement/bin/
 UserManagement/obj/
 WorkflowConfigurator/bin/

Common/Common.csproj

@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -25,7 +25,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -64,6 +64,7 @@
       <DependentUpon>ModelessForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Formulas.cs" />
+    <Compile Include="CurrentUser.cs" />
     <Compile Include="GlobalData.cs" />
     <Compile Include="IMeasurementCorrection.cs" />
     <Compile Include="IOrderInfo.cs" />
@@ -76,6 +77,7 @@
     </Compile>
     <Compile Include="QuitAppException.cs" />
     <Compile Include="SerializableDictionary.cs" />
+    <Compile Include="StatisticalMetrics.cs" />
     <Compile Include="Telegram.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
       <SubType>UserControl</SubType>

Common/CurrentUser.cs

@@ -0,0 +1,132 @@
+///
+/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace Common
+{
+    class UserAndForm
+    {
+        public readonly IUser User;
+        public readonly Form Form;
+
+        public UserAndForm(IUser user, Form form)
+        {
+            User = user;
+            Form = form;
+        }
+    }
+
+    public static class CurrentUser
+    {
+        public const string AdminUsername = "admin";
+        public const string AdminPassword = "staratura";
+
+        public static int MinPasswdLength = 0;
+        public static int PasswdExpirationPeriodDays = 0; 
+
+        public static DBSettings RemoteUsersDB = null;
+		public static DBSettings LocalUsersDB = null;
+
+
+        static readonly Stack<UserAndForm> userStack = new Stack<UserAndForm>();
+
+        public static Common.AuthorizedAs AuthorizedAs;
+        public static DateTime LastAuthorization = DateTime.Now;
+
+
+        /// <summary>
+        /// Push a new user into the stack of users and form references.
+        /// Prevent double user stack entry for the same Windows form.
+        /// </summary>
+        /// <param name="newUser">New user</param>
+        /// <param name="currentForm">Reference to the current form</param>
+        public static void Change(IUser newUser, Form currentForm)
+        {
+            if (userStack.Count > 0 && userStack.Peek().Form == currentForm)
+            {
+                userStack.Pop();
+            }
+
+            userStack.Push(new UserAndForm(newUser, currentForm));
+        }
+
+        /// <summary>
+        /// Restore an original user from the stack of users - remove user at the top of the stack.
+        /// Prevent restoring when there is no entry for the form currently being closed.
+        /// </summary>
+        /// <param name="formBeingClosed">Reference to the form currently being closed</param>
+        /// <returns>true = current user was restored, false = no current user change</returns>
+        public static bool Restore(Form formBeingClosed)
+        {
+            if (userStack.Count > 0 && userStack.Peek().Form == formBeingClosed)
+            {
+                userStack.Pop();
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Return the user currenty at the top of the stack of users.
+        /// </summary>
+        public static IUser User()
+        {
+            return (userStack.Count > 0) ? userStack.Peek().User : null;    /// TODO: Return default user when stack is empty
+        }
+
+        public static IUser User2;
+        public static IUser User3;
+
+        /// <summary>
+        /// Return the current user name or an empty string
+        /// </summary>
+        public static string UserName()
+        {
+            if (User() == null || User().UserName == null)
+                return string.Empty;
+            else if (User2 == null || User2.UserName == null)
+                return User().UserName;
+            else if (User3 == null || User3.UserName == null)
+                return string.Format("{0},{1}", User().UserName, User2.UserName);
+            else
+                return string.Format("{0},{1},{2}", User().UserName, User2.UserName, User3.UserName);
+        }
+
+        public static string GetEncodedString(string legalizator)
+        {
+            if (User() == null || User().UserName == null) return string.Empty;
+            return string.Format("{0}~{1}~{2}",
+                                 User().UserName,
+                                 User().FullName == null ? string.Empty : User().FullName,
+                                 legalizator == null ? string.Empty : legalizator);
+        }
+                
+
+        /// <summary>
+        /// Return the current user number or 0
+        /// </summary>
+        public static int Number()
+        {
+            return (User() != null) ? User().Number : 0;
+        }
+
+        public static bool IsPowerUser()
+        {
+            return (User() != null) ? User().IsPowerUser() : false;
+        }
+
+        public static bool IsMemberOf(GID groupId)
+        {
+            return (User() != null) ? User().IsMemberOf(groupId) : false;
+        }
+
+        public static bool IsMemberOf(GID[] groupIds)
+        {
+            return (User() != null) ? User().IsMemberOf(groupIds) : (groupIds == null);
+        }
+    }
+}

Common/DBSettings.cs

@@ -10,14 +10,14 @@ namespace Common
 	/// </summary>
 	public class DBSettings : ICloneable
 	{
-		public Common.DBType DbType;
+		public DBType DbType;
 		public string ConnectionString;
 
 		public DBSettings()
 		{
 		}
 
-		public DBSettings(Common.DBType dbType, string connectionString)
+		public DBSettings(DBType dbType, string connectionString)
 		{
 			this.DbType = dbType;
 			this.ConnectionString = connectionString;

Common/Enums.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -185,12 +185,23 @@ namespace Common
 		Count,
 	}
 
+    public enum FlowNames
+    {
+        QnQtQmin = 0,
+        Q3Q2Q1 = 1,
+        QpQi = 2,
+        Count,
+    }
+
     public enum ProfileType
     {
         Q3R,
         QnClassColdWater,
         QnClassHotWater,
         QpQi,
+        Q3RCompound,
+        QnClassCompound,
+        QpQiCompound,
         Manual,
         Count,
     }
@@ -266,11 +277,13 @@ namespace Common
         [Description("V")]      V,         /// vertical
         [Description("STR")]    S,         /// standrohre
         [Description("F")]      F,         /// fall
+        [Description("H/V")]    HV,        /// horizontal / vertical
 #else
-        [Description("H")] H,              /// horizontal
-        [Description("V")] V,              /// vertical
-        [Description("S")] S,              /// steig
-        [Description("F")] F,              /// fall
+        [Description("H")]      H,         /// horizontal
+        [Description("V")]      V,         /// vertical
+        [Description("S")]      S,         /// steig
+        [Description("F")]      F,         /// fall
+        [Description("H/V")]    HV,        /// horizontal / vertical
 #endif
 		Count
     }

Common/Formulas.cs

@@ -213,9 +213,9 @@ namespace Common
 		/// </summary>
 		public static double ErrorFromVolumes(double measuredVolume, double trueVolume)
 		{
-			if (trueVolume <= float.Epsilon)
+			if (Math.Abs(trueVolume) <= float.Epsilon)
 			{
-				if (measuredVolume <= float.Epsilon)
+				if (Math.Abs(measuredVolume) <= float.Epsilon)
 				{
 					log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, -100.0);
 					return -100.0;

Common/GlobalData.cs

@@ -5,38 +5,10 @@ using System;
 
 namespace Common
 {
-    public class GlobalData
+    public static class GlobalData
     {
         public static double SampleDensity = 0; /// sample water density measured in an accredited labo [kg/m3]
         public static double SampleTemp = 0;    /// sample temperature when density measured in an accredited labo [°C]
         public static double Buoyancy = 0;
-
-        public const string AdminUsername = "admin";
-        public const string AdminPassword = "staratura";
-
-        public static DBSettings RemoteUsersDB = null;
-		public static DBSettings LocalUsersDB = null;
-
-        public static IUser CurrentUser;
-        public static IUser CurrentUser2;
-        public static IUser CurrentUser3;
-        
-        public static Common.AuthorizedAs AuthorizedAs;
-		public static DateTime LastAuthorization = DateTime.Now;
-
-        public static int MinPasswdLength = 0;
-        public static int PasswdExpirationPeriodDays = 0; 
-
-        public static string GetCurrentUserName()
-        {
-            if (CurrentUser == null || CurrentUser.UserName == null)
-                return string.Empty;
-            else if (CurrentUser2 == null || CurrentUser2.UserName == null)
-                return CurrentUser.UserName;
-            else if (CurrentUser3 == null || CurrentUser3.UserName == null)
-                return string.Format("{0},{1}", CurrentUser.UserName, CurrentUser2.UserName);
-            else
-                return string.Format("{0},{1},{2}", CurrentUser.UserName, CurrentUser2.UserName, CurrentUser3.UserName);
-        }
     }
 }

Common/IMeasurementCorrection.cs

@@ -5,7 +5,7 @@ namespace Common
     public interface IMeasurementCorrection
     {
         int RangeIx { get; set; }
-        float Measurement { get; set; }
-        float Correction { get; set; }
+        double Measurement { get; set; }
+        double Correction { get; set; }
     }
 }

Common/IUser.cs

@@ -10,6 +10,7 @@ namespace Common
         int Number { get; }
 
         /// Access rights
+        bool IsPowerUser();
         bool IsMemberOf(GID group);
         bool IsMemberOf(GID[] groups);
         bool IsCorrectPassword(string password);

Common/Iperl/OptoTelegramRaw.cs

@@ -35,7 +35,7 @@ namespace Common.Iperl
 		public float RefFlow;			/// [m3/h]
 		public int Counter;				
 
-		public UInt32 EmfRaw;			/// From iPerl opto data
+		public Int32 EmfRaw;			/// Signed EMF from iPerl opto data
 		public Int16 MagneticFieldRaw;
 		public Int16 FlowRaw;
 		public UInt32 VolumeRaw;
@@ -50,8 +50,7 @@ namespace Common.Iperl
 		///
 		public double EMF()
 		{
-			Int32 signedEmf = (EmfRaw > 0x7FFFFF) ? ((int)EmfRaw - 0x1000000) : (int)EmfRaw;
-			return 0.000000333 * (double)signedEmf;
+            return 0.000000333 * (double)EmfRaw;
 		}
 		public double MagneticField() { return (double)MagneticFieldRaw; }
 		public double Flow(double scalingFactor) { return 0.225 * scalingFactor * (double)FlowRaw; }
@@ -120,7 +119,10 @@ namespace Common.Iperl
 				return false;
 			}
 
-			bool f1 = UInt32.TryParse(telegram.Substring(0, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out EmfRaw);
+            UInt32 uEmfRaw;
+            bool f1 = UInt32.TryParse(telegram.Substring(0, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out uEmfRaw);
+            EmfRaw = (uEmfRaw > 0x7FFFFF) ? ((int)uEmfRaw - 0x1000000) : (int)uEmfRaw;
+
 			bool f2 = Int16.TryParse(telegram.Substring(7, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out MagneticFieldRaw);
 			bool f3 = Int16.TryParse(telegram.Substring(12, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out FlowRaw);
 			bool f4 = UInt32.TryParse(telegram.Substring(17, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out VolumeRaw);
@@ -243,7 +245,7 @@ namespace Common.Iperl
 									DateTime.Second.ToString("D2"),
 									DateTime.Millisecond.ToString("D4"),
 									Counter,
-									EmfRaw.ToString("X6"),
+									(EmfRaw & 0x00FFFFFF).ToString("X6"),
 									MagneticFieldRaw.ToString("X4"),
 									FlowRaw.ToString("X4"),
 									VolumeRaw.ToString("X6"),

Common/StatisticalMetrics.cs

@@ -0,0 +1,338 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Common.Iperl;
+
+namespace Common
+{
+    public static class Extensions
+    {
+        public static float[] SubArray(this float[] array, int offset, int length)
+        {
+            float[] result = new float[length];
+            Array.Copy(array, offset, result, 0, length);
+            return result;
+        }
+    }
+
+    public class StatisticalMetrics
+    {
+        const int VectorSize = 7;
+        const int MinLength = 100;
+        const float AdcBit = (float)57e-9;
+        const int NeighbourhoodSize = 30;       /// To determine extended outliers
+
+        /// <summary>
+        /// Calculates a 7-dimensional vector with these components:
+        /// x[0] = X1 = Number of outliers
+        /// x[1] = X2 = Relative cal-factor shift due to outliers
+        /// x[2] = X3 = Standard deviation of high-pass filteres ++++ demodulation of EMF (cut-off at Nyquist frequency)
+        /// x[3] = X4 = Robust standard deviation of high-pass filtered ++++ demodulation
+        /// x[4] = X5 = Peak-to-peak of low-pass filtered ++++ demodulation of EMF (cut-off TBD)
+        /// x[5] = X6 = Peak-to-peak of reference flow rate
+        /// x[6] = X7 = Mean impedance (++-- demodulation)
+        /// </summary>
+        /// <param name="optoData"></param>
+        /// <param name="optoDataCount"></param>
+        /// <param name="startIx"></param>
+        /// <param name="endIx"></param>
+        /// <returns></returns>
+        public static float[] Calculate(OptoTelegramRaw[] optoData, int optoDataCount, int startIx, int endIx, bool downsample,
+                                        out float[] offsetV, out float[] kOhmsR, out float[] kOhmsC, out float[] dutFlow,
+                                        out float[] refFlow, out float[] flowRatio, out float[] magField, out float[] emfV,
+                                        out PointF[] outliers, out PointF[] extendedOutliers)
+        {
+            offsetV = kOhmsR = kOhmsC = dutFlow = refFlow = flowRatio = magField = emfV = null;
+            outliers = extendedOutliers = null;
+
+            if (optoData == null || optoData.Length < optoDataCount ||
+                startIx < 0 || endIx >= optoDataCount || endIx <= startIx + MinLength + 3) return null;
+
+            float[] modulatedData = GetModulatedEmf(optoData, optoDataCount, AdcBit);
+
+            FindShiftAndDemodulate(modulatedData, downsample,
+                                   new float[] { +1, +1, +1, +1 }, out offsetV,
+                                   new float[] { +1, +1, -1, -1 }, out kOhmsR,
+                                   new float[] { +1, -1, -1, +1 }, out kOhmsC,
+                                   new float[] { +1, -1, +1, -1 }, out dutFlow);
+            //offsetV = FirFilter(modulatedData, new float[] { 1, 3, 4, 4, 3, 1}, 0.0625F); 
+
+            magField = GetMagField(optoData, optoDataCount, downsample, new float[] { 1, 1, 1, 1 });
+            
+            refFlow = GetRefFlow(optoData, optoDataCount, downsample, new float[] { 1, 1, 1, 1 });
+            
+            flowRatio = new float[Math.Min(dutFlow.Length, refFlow.Length)];
+            for (int i = 0; i < flowRatio.Length; i++)
+            {
+                flowRatio[i] = (refFlow[i] != 0) ? dutFlow[i] / refFlow[i] : 1;
+            }
+
+
+            float[] x = new float[VectorSize];
+
+            /// X1 = Number of outliers
+            int outliersCount = GetOutliers(flowRatio, out outliers, out extendedOutliers);
+
+            
+            /// X2 = Relative cal-factor shift due to outliers
+
+            /// X3 = Standard deviation of high-pass filteres ++++ demodulation of EMF (cut-off at Nyquist frequency)
+
+            /// X4 = Robust standard deviation of high-pass filtered ++++ demodulation
+            
+            /// X5 = Peak-to-peak of low-pass filtered ++++ demodulation of EMF (cut-off TBD)
+            
+            /// X6 = Peak-to-peak of reference flow rate
+            
+            /// X7 = Mean impedance (++-- demodulation)
+            double sum = 0;
+            foreach (var z in kOhmsR) sum += z;
+            x[6] = Convert.ToSingle(sum / kOhmsR.Length);
+
+            return x;
+        }
+
+
+        static float[] GetModulatedEmf(OptoTelegramRaw[] optoData, int optoDataCount, float factor)
+        {
+            if (optoData == null || optoDataCount < 0) return null;
+
+            float[] result = new float[optoDataCount];
+            for (int i = 0; i < optoDataCount; i++)
+            {
+                result[i] = optoData[i].EmfRaw * factor;
+            }
+            return result;
+        }
+
+
+        static float[] GetMagField(OptoTelegramRaw[] optoData, int optoDataCount, bool downsample, float[] kernel)
+        {
+            if (optoData == null || optoDataCount < 0 || (downsample && (kernel == null || kernel.Length < 4))) return null;
+
+            int resultLen = downsample ? (optoDataCount / 4) : optoDataCount;
+            float[] result = new float[resultLen];
+
+            if (downsample)
+            {
+                float ksum = 0;
+                for (int j = 0; j < kernel.Length; j++) ksum += kernel[j];
+                for (int j = 0; j < kernel.Length; j++) kernel[j] /= ksum;
+
+                for (int i = 0; (4 * i) + kernel.Length - 1 < optoDataCount; i++)
+                {
+                    float sum = 0;
+                    for (int j = 0; j < kernel.Length; j++) sum += Convert.ToSingle(optoData[4 * i + j].MagneticFieldRaw) * kernel[j]; 
+                    result[i] = sum;
+                }
+            }
+            else
+            {
+                for (int i = 0; i < optoDataCount; i++) result[i] = optoData[i].MagneticFieldRaw;
+            }
+
+            return result;
+        }
+
+
+        static float[] GetRefFlow(OptoTelegramRaw[] optoData, int optoDataCount, bool downsample, float[] kernel)
+        {
+            if (optoData == null || optoDataCount < 0 || (downsample && (kernel == null || kernel.Length < 4))) return null;
+
+            int resultLen = downsample ? (optoDataCount / 4) : optoDataCount;
+            float[] result = new float[resultLen];
+
+            if (downsample)
+            {
+                float ksum = 0;
+                for (int j = 0; j < kernel.Length; j++) ksum += kernel[j];
+                for (int j = 0; j < kernel.Length; j++) kernel[j] /= ksum;
+
+                for (int i = 0; (4 * i) + kernel.Length - 1 < optoDataCount; i++)
+                {
+                    float sum = 0;
+                    for (int j = 0; j < kernel.Length; j++) sum += Convert.ToSingle(optoData[4 * i + j].RefFlow) * kernel[j];
+                    result[i] = sum;
+                }
+            }
+            else
+            {
+                for (int i = 0; i < optoDataCount; i++) result[i] = optoData[i].RefFlow;
+            }
+
+            return result;
+        }
+
+
+        public static void FindShiftAndDemodulate(float[] modulatedData, bool downsample,
+                                                  float[] kernel1, out float[] data1,
+                                                  float[] kernel2, out float[] data2,
+                                                  float[] kernel3, out float[] data3,
+                                                  float[] kernel4, out float[] data4)
+        {
+            int shift = GetShift(modulatedData.SubArray(0, MinLength));
+
+            data1 = (kernel1 != null) ? Demodulate(modulatedData, kernel1, shift, downsample) : null;
+            data2 = (kernel2 != null) ? Demodulate(modulatedData, kernel2, shift, downsample) : null;
+            data3 = (kernel3 != null) ? Demodulate(modulatedData, kernel3, shift, downsample) : null;
+            data4 = (kernel4 != null) ? Demodulate(modulatedData, kernel4, shift, downsample) : null;
+        }
+
+
+        /// <summary>
+        /// Unlike FIR filtering, demodulation shifts the kernel in 4 phases
+        /// </summary>
+        /// <param name="data">Input data</param>
+        /// <param name="kernel">Demodulation kernel</param>
+        /// <param name="shift">shift 0..3</param>
+        /// <returns>Output data</returns>
+        static float[] Demodulate(float[] data, float[] kernel, int shift, bool downsample)
+        {
+            if (data == null || data.Length < MinLength || kernel == null || kernel.Length != 4)
+            {
+                return null;
+            }
+
+            float ksum = 0;
+            for (int i = 0; i < 4; i++) ksum += Math.Abs(kernel[i]);
+            for (int i = 0; i < 4; i++) kernel[i] /= ksum;
+
+            int rsltLen = downsample ? (data.Length - 3) / 4 : data.Length - 3;
+            float[] result = new float[rsltLen];
+
+            if (downsample)
+            {
+                for (int i = shift; i < 4 * rsltLen; i += 4)
+                {
+                    float sum = 0;
+                    for (int j = 0; j < 4; j++) sum += data[i + j] * kernel[(i + j + 4 - shift) % 4];
+                    result[i / 4] = sum;
+                }
+            }
+            else
+            {
+                for (int i = 0; i < rsltLen; i++)
+                {
+                    float sum = 0;
+                    for (int j = 0; j < 4; j++) sum += data[i + j] * kernel[(i + j + 4 - shift) % 4];
+                    result[i] = sum;
+                }
+            }
+
+            return result;
+        }
+
+
+        /// <summary>
+        /// Determine modulation phase by maximizing ++-- demodulation result.
+        /// </summary>
+        /// <param name="modulatedEmf">Input data</param>
+        /// <returns>0..3 = modulation phase or, -1 = error</returns>
+        static int GetShift(float[] modulatedData)
+        {
+            float[] kernel = new float[4] { 1, 1, -1, -1 };
+            int maximizingShift = -1;
+            float maximum = float.MinValue;
+
+            for (int shift = 0; shift <= 3; shift++)
+            {
+                var demodulatedCandidate = Demodulate(modulatedData, kernel, shift, false);
+                float sum = 0;
+                foreach (var d in demodulatedCandidate) sum += d;
+                if (sum > maximum)
+                {
+                    maximum = sum;
+                    maximizingShift = shift;
+                }
+            }
+
+            return maximizingShift;
+        }
+
+
+        /// <summary>
+        /// FIR filtering = convolution with a kernel
+        /// </summary>
+        /// <param name="data">Input data</param>
+        /// <param name="kernel">Convolution kernel</param>
+        /// <returns>Output data</returns>
+        static float[] FirFilter(float[] data, float[] kernel, float factor)
+        {
+            if (data == null || kernel == null) return null;
+
+            int kernelLen = kernel.Length;
+            int rsltLen = data.Length - kernelLen + 1;
+            if (rsltLen < 0) return null;
+
+            float[] result = new float[rsltLen];
+            for (int i = 0; i < rsltLen; i++)
+            {
+                float sum = 0;
+                for (int j = 0; j < kernelLen; j++) sum += data[i + j] * kernel[j];
+                result[i] = sum * factor;
+            }
+            return result;
+        }
+
+
+        static int GetOutliers(float[] flowRatio, out PointF[] outliers, out PointF[] extendedOutliers)
+        {
+            float mean = Enumerable.Average(flowRatio);
+            var fr = new float[flowRatio.Length];
+            for (int i = 0; i < fr.Length; i++) fr[i] = flowRatio[i] - mean;
+
+            Array.Sort(fr);
+            float qLo = fr[fr.Length / 4];
+            float qHi = fr[3 * fr.Length / 4];
+
+            int N = fr.Length / 2;
+            float sumY = 0;
+            float sumYY = 0;
+            for (int i = fr.Length / 4; i < 3 * fr.Length / 4; i++)
+            {
+                sumY += fr[i];
+                sumYY += fr[i] * fr[i];
+            }
+            float std = (float)Math.Sqrt(sumYY / N - (sumY / N) * (sumY / N));
+            float robustStd = std * 5.1812824F;
+            float threshold = 7 * robustStd;
+
+            /// Restore fr as it was before sorting
+            for (int i = 0; i < fr.Length; i++) fr[i] = flowRatio[i] - mean;
+
+            IList<PointF> listOfOutliers = new List<PointF>();
+            bool[] boolExtendedOutliers = new bool[fr.Length];
+            int outliersCount = 0;
+            for (int i = 0; i < fr.Length; i++)
+            {
+                if (fr[i] < -threshold || fr[i] > threshold)
+                {
+                    /// This is an outlier
+                    listOfOutliers.Add(new PointF(Convert.ToSingle(i), fr[i] + mean));
+                    outliersCount++;
+                    for (int j = Math.Max(0, i - NeighbourhoodSize); j <= Math.Min(i + NeighbourhoodSize, fr.Length - 1); j++)
+                    {
+                        boolExtendedOutliers[j] = true;
+                    }
+                }
+            }
+
+            IList<PointF> listOfExtendedOutliers = new List<PointF>();
+            for (int i = 0; i < fr.Length; i++)
+            {
+                if (boolExtendedOutliers[i])
+                {
+                    listOfExtendedOutliers.Add(new PointF(Convert.ToSingle(i), fr[i] + mean));
+                }
+            }
+
+            outliers = listOfOutliers.ToArray<PointF>();
+            extendedOutliers = listOfExtendedOutliers.ToArray<PointF>();
+
+            return outliersCount;
+        }
+    }
+}

Common/Units.cs

@@ -2,7 +2,6 @@
 /// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
-using System.Reflection;
 
 namespace Common
 {
@@ -358,21 +357,21 @@ namespace Common
             }
 		}
 
-		public static bool IsVolume(Unit units)       { return IsQuantity(units, Quantity.Volume); }
-		public static bool IsFlow(Unit units)         { return IsQuantity(units, Quantity.Flow); }
-        public static bool IsMass(Unit units)         { return IsQuantity(units, Quantity.Mass); }
-        public static bool IsTime(Unit units)         { return IsQuantity(units, Quantity.Time); }
-        public static bool IsTemperature(Unit units)  { return IsQuantity(units, Quantity.Temperature); }
-		public static bool IsPressure(Unit units)     { return IsQuantity(units, Quantity.Pressure); }
-        public static bool IsHumidity(Unit units)     { return IsQuantity(units, Quantity.Humidity); }
-        public static bool IsError(Unit units)        { return IsQuantity(units, Quantity.Error); }
-		public static bool IsLength(Unit units)       { return IsQuantity(units, Quantity.Length); }
-		public static bool IsDensity(Unit units)      { return IsQuantity(units, Quantity.Density); }
-		public static bool IsEnergy(Unit units)       { return IsQuantity(units, Quantity.Energy); }
-        public static bool IsPulses(Unit units)       { return IsQuantity(units, Quantity.Pulses); }
-        public static bool IsPulsePerLtr(Unit units)  { return IsQuantity(units, Quantity.PulsePerLtr); }
-        public static bool IsPulsePerKWh(Unit units)  { return IsQuantity(units, Quantity.PulsePerKWh); }
-        public static bool IsConductivity(Unit units) { return IsQuantity(units, Quantity.Conductivity); }
+		public static bool IsVolume(Unit unit)       { return IsQuantity(unit, Quantity.Volume); }
+		public static bool IsFlow(Unit unit)         { return IsQuantity(unit, Quantity.Flow); }
+        public static bool IsMass(Unit unit)         { return IsQuantity(unit, Quantity.Mass); }
+        public static bool IsTime(Unit unit)         { return IsQuantity(unit, Quantity.Time); }
+        public static bool IsTemperature(Unit unit)  { return IsQuantity(unit, Quantity.Temperature); }
+		public static bool IsPressure(Unit unit)     { return IsQuantity(unit, Quantity.Pressure); }
+        public static bool IsHumidity(Unit unit)     { return IsQuantity(unit, Quantity.Humidity); }
+        public static bool IsError(Unit unit)        { return IsQuantity(unit, Quantity.Error); }
+		public static bool IsLength(Unit unit)       { return IsQuantity(unit, Quantity.Length); }
+		public static bool IsDensity(Unit unit)      { return IsQuantity(unit, Quantity.Density); }
+		public static bool IsEnergy(Unit unit)       { return IsQuantity(unit, Quantity.Energy); }
+        public static bool IsPulses(Unit unit)       { return IsQuantity(unit, Quantity.Pulses); }
+        public static bool IsPulsePerLtr(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerLtr); }
+        public static bool IsPulsePerKWh(Unit unit)  { return IsQuantity(unit, Quantity.PulsePerKWh); }
+        public static bool IsConductivity(Unit unit) { return IsQuantity(unit, Quantity.Conductivity); }
 
 
 

Common/Utils.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 
@@ -14,6 +14,24 @@ namespace Common
             return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
         }
 
+        public static string ToNiceString(double value, int sigDigits)
+        {
+            string format = SignificantDigitsToFmt(value, sigDigits);
+            return (format == "F0") ? value.ToString("F0") : value.ToString(format).TrimEnd(new char[] { '0' });
+        }
+
+        public static FlowNames ProfileType2FlowNames(ProfileType pt)
+        {
+            switch (pt)
+            {
+                case ProfileType.Q3R:               return FlowNames.Q3Q2Q1;
+                case ProfileType.QnClassColdWater:  return FlowNames.QnQtQmin;
+                case ProfileType.QnClassHotWater:   return FlowNames.QnQtQmin;
+                case ProfileType.QpQi:              return FlowNames.QpQi;
+                default:                            return FlowNames.Q3Q2Q1;
+            }
+        }
+
         public static string SignificantDigitsToFmt(double value, int sigDigits)
         {
             if (sigDigits == 6)
@@ -212,9 +230,9 @@ namespace Common
             int length = string.IsNullOrEmpty(password) ? 0 : password.Length;
 
             /// Password length must be at least 6
-            if (length < GlobalData.MinPasswdLength)
+            if (length < CurrentUser.MinPasswdLength)
             {
-                explanation = string.Format("Password must have at least {0} characters", GlobalData.MinPasswdLength);
+                explanation = string.Format("Password must have at least {0} characters", CurrentUser.MinPasswdLength);
                 return false;
             }
             else
@@ -272,14 +290,13 @@ namespace Common
             int number = (date.Year % 10) + 10 * (date.Month - 1) + 120 * date.Day;
             string passwordOfDay = Convert.ToString(number, 8);
 
-            return (userName.Equals("milan") && password.Equals("kremik")) ||
+            return (userName.Equals("milan") && password.Equals("kraken")) ||
                    (userName.Equals("igor") && password.Equals("mojronko8")) ||
-                   (userName.Equals("MARIAN") && password.Equals("NM-309BN")) ||
                    (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
-                   (userName.Equals("Michal") && password.Equals("1236natahA8")) ||
+                   (userName.Equals("Michal") && password.Equals("Plok789456123")) ||
                    (userName.Equals("martin") && password.Equals("vaclavek84")) ||
                    (userName.Equals("pakan") && password.Equals("kuriatko")) ||
-                   (userName.Equals("augustin") && password.Equals("jaugust")) ||
+                   (userName.Equals("jan") && password.Equals("jaugust")) ||
                    (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
                    (userName.Equals("gilles") && password.Equals("alibaba")) ||
                    (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));

Config/Entities/BenchPath.cs

@@ -1,8 +1,9 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Config.Entities
 {
@@ -12,8 +13,9 @@ namespace Config.Entities
 		public virtual int    ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual float  Qfrom { get; set; }           /// Water flow in [m3/h]
-        public virtual float  Qto { get; set; }             /// Water flow in [m3/h]
+        public virtual double Qfrom { get; set; }           /// Water flow in [m3/h]
+        public virtual double Qto { get; set; }             /// Water flow in [m3/h]
+        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
         public virtual string TempMtrUp { get; set; }
         public virtual string TempMtrDown { get; set; }
@@ -26,13 +28,16 @@ namespace Config.Entities
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
+        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public BenchPath()
         {
 			ValvesOpen  = string.Empty;
 			ValvesClose = string.Empty;
-		}
+        }
 
 		public BenchPath(string name, int itemNr)
 			: this()
@@ -47,6 +52,7 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
+            result.FlowUnit      = FlowUnit;
             result.Selector      = Selector;
             result.TempMtrUp     = TempMtrUp;
 			result.TempMtrDown   = TempMtrDown;

Config/Entities/FeedingPath.cs

@@ -1,27 +1,32 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Config.Entities
 {
 	public class FeedingPath : IHasName, IHasItemNr, IHasValves
     {
-        public virtual int Id { get; protected set; }
-		public virtual int ItemNr { get; set; }
+        public virtual int    Id { get; protected set; }
+		public virtual int    ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual float Qfrom { get; set; }            /// Water flow in [m3/h]
-        public virtual float Qto { get; set; }              /// Water flow in [m3/h]
+        public virtual double Qfrom { get; set; }           /// Water flow in [m3/h]
+        public virtual double Qto { get; set; }             /// Water flow in [m3/h]
+        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
 		public virtual string Pump { get; set; }
-        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in % separated by ';'
+        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in Category.Feeding in % separated by ';'
 
         /// Valves
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
+        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public FeedingPath()
@@ -43,6 +48,7 @@ namespace Config.Entities
 
 			result.Qfrom         = Qfrom;
             result.Qto           = Qto;
+            result.FlowUnit      = FlowUnit;
             result.Selector      = Selector;
 			result.Pump          = Pump;
             result.RegVPositions = RegVPositions;

Config/Entities/MeasurementCorrection.cs

@@ -1,17 +1,17 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 
 namespace Config.Entities
 {
-	public class MeasurementCorrection : Common.IMeasurementCorrection
+    public class MeasurementCorrection : Common.IMeasurementCorrection, IComparable<MeasurementCorrection>
 	{
 		public virtual int Id { get; protected set; }
         public virtual int RangeIx { get; set; }        /// 0..5
-		public virtual float Measurement { get; set; }
-		public virtual float Correction { get; set; }
+		public virtual double Measurement { get; set; }
+		public virtual double Correction { get; set; }
 
         public MeasurementCorrection()
         {
@@ -23,6 +23,11 @@ namespace Config.Entities
             RangeIx = rangeIx; 
         }
 
+        public virtual int CompareTo(MeasurementCorrection other)
+        {
+            return (Measurement > other.Measurement) ? 1 : ((Measurement == other.Measurement) ? 0 : -1);
+        }
+
 
         /// <summary>
         /// Calculates corrected value from a list of corrections by interpolation.
@@ -76,5 +81,10 @@ namespace Config.Entities
             /// rawValue is above the highest value in the correction table
             return corrections[corrections.Count - 1].Correction;
         }
+
+        public override string ToString()
+        {
+            return string.Format("{0} {1} ({2})", Measurement, Correction, RangeIx);
+        }
     }
 }

Config/Entities/OutputPath.cs

@@ -1,39 +1,45 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Config.Entities
 {
 	public class OutputPath : IHasName, IHasItemNr, IHasValves
     {
-        public virtual int Id { get; protected set; }
-		public virtual int ItemNr { get; set; }
+        public virtual int    Id { get; protected set; }
+		public virtual int    ItemNr { get; set; }
 		public virtual string Name { get; set; }
         public virtual string OriName { get; set; }         /// Not mapped to database
-        public virtual float Qfrom { get; set; }			/// Water flow in [m3/h]
-        public virtual float Qto { get; set; }				/// Water flow in [m3/h]
+        public virtual double Qfrom { get; set; }			/// Water flow in [m3/h]
+        public virtual double Qto { get; set; }				/// Water flow in [m3/h]
+        public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
         public virtual string RegValve { get; set; }
 		public virtual string FlowMeter { get; set; }
-		public virtual float PidCoef { get; set; }			/// PID coefficient for the regulation path
+		public virtual float  PidCoef { get; set; }			/// PID coefficient for the regulation path
         public virtual string StartValve { get; set; }
         public virtual string Diverter { get; set; }
 		public virtual string TempMtrDiv { get; set; }
 		public virtual string Scale { get; set; }
+        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in Category.Output in % separated by ';'
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
 		public virtual string ValvesClose { get; set; }
 
+        public virtual bool QfromTextChngd { get; set; }    /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+        public virtual bool QtoTextChngd { get; set; }      /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
+
         /// ------------- Additional stuff not mapped into the database -------------
 
 		public OutputPath()
         {
 			ValvesOpen = string.Empty;
 			ValvesClose = string.Empty;
-		}
+        }
 
 		public OutputPath(string name, int itemNr)
 			: this()
@@ -49,6 +55,7 @@ namespace Config.Entities
 			result.Name        = Name;
 			result.Qfrom       = Qfrom;
             result.Qto         = Qto;
+            result.FlowUnit    = FlowUnit;
             result.Selector    = Selector;
             result.RegValve    = RegValve;
 			result.FlowMeter   = FlowMeter;
@@ -57,6 +64,7 @@ namespace Config.Entities
 			result.Diverter    = Diverter;
 			result.TempMtrDiv  = TempMtrDiv;
 			result.Scale       = Scale;
+            result.RegVPositions= RegVPositions;
 			result.ValvesOpen  = ValvesOpen;
 			result.ValvesClose = ValvesClose;
 

Config/Entities/PTest.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Globalization;
@@ -27,6 +27,7 @@ namespace Config.Entities
         public virtual double PressLimHi { get; set; }          /// [bar] max. water pressure                                            
         public virtual sbyte Publish { get; set; }			    /// 0=no, 1=in all protocols, 2=on screen, 3=internal
         public virtual bool Evaluate { get; set; }
+        public virtual string Method { get; set; }              /// Test method (component name)
 
         public virtual sbyte E1 { get; set; }                   ///
         public virtual sbyte E2 { get; set; }                   ///
@@ -81,6 +82,7 @@ namespace Config.Entities
             PressLimHi = 16.0;	    /// [bar]
             Publish = (sbyte)Common.Publish.Always;
             Evaluate = true;
+            Method = string.Empty;
 
             E1 = (sbyte)ErrorFlagsMode.On;
             E2 = (sbyte)ErrorFlagsMode.On;
@@ -140,6 +142,7 @@ namespace Config.Entities
             result.PressLimHi = PressLimHi;
             result.Publish = Publish;
             result.Evaluate = Evaluate;
+            result.Method = Method;
 
             result.E1 = E1;
             result.E2 = E2;
@@ -193,6 +196,7 @@ namespace Config.Entities
             output.WriteLine(PressLimHi.ToString(ci));
             output.WriteLine(Publish.ToString());
             output.WriteLine(Evaluate.ToString());
+            output.WriteLine(Method);
 
             output.WriteLine(E1.ToString());
             output.WriteLine(E2.ToString());
@@ -247,10 +251,29 @@ namespace Config.Entities
 			tst.ErrLimHi = double.Parse(input.ReadLine(), ci);
 			tst.TempLimLo = double.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = double.Parse(input.ReadLine(), ci);
-            tst.Publish = sbyte.Parse(input.ReadLine());
+            tst.PressLimLo = double.Parse(input.ReadLine(), ci);
+            tst.PressLimHi = double.Parse(input.ReadLine(), ci);
+            tst.Publish = sbyte.Parse(input.ReadLine(), ci);
             tst.Evaluate = bool.Parse(input.ReadLine());
+            tst.Method = input.ReadLine();
 
-            /// TODO (E1 .. E21)
+            tst.E1 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E2 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E3 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E4 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E5 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E6 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E7 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E8 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E9 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E10 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E11 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E12 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E13 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E14 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E15 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E16 = sbyte.Parse(input.ReadLine(), ci);
+            tst.E21 = sbyte.Parse(input.ReadLine(), ci);
 
             tst.Delta_Q_pct = double.Parse(input.ReadLine(), ci);
             tst.Delta_T = double.Parse(input.ReadLine(), ci);
@@ -293,6 +316,7 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != PressLimHi.ToString(ci))   { diff.AppendFormat(fmt, "Pressure_max", PressLimHi.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Publish.ToString())        { diff.AppendFormat(fmt, "Publish", Publish.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != Evaluate.ToString())       { diff.AppendFormat(fmt, "Evaluate", Evaluate.ToString(), ln); };
+            ln = inp.ReadLine(); if (ln != Method)                    { diff.AppendFormat(fmt, "Method", Method, ln); };
 
             ln = inp.ReadLine(); if (ln != E1.ToString()) { diff.AppendFormat(fmt, "E1", E1.ToString(), ln); };
             ln = inp.ReadLine(); if (ln != E2.ToString()) { diff.AppendFormat(fmt, "E2", E2.ToString(), ln); };

Config/Entities/Procedure.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -47,7 +47,7 @@ namespace Config.Entities
         public virtual int AltProcPeriod { get; set; }			/// Period of alternative procedures (0 = no alt. procedure)
 
         public virtual float DN { get; set; }                   /// Not mapped to DB, valid in ProceduresCtrl for procedure filtering only
-        public virtual float Qn { get; set; }                   ///   - ' ' -
+        public virtual double Qn { get; set; }                  ///   - ' ' -
         public virtual string MClass { get; set; }              ///   - ' ' -
         public virtual string Producer { get; set; }            ///   - ' ' -
 
@@ -75,7 +75,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-            CreationUser = Common.GlobalData.GetCurrentUserName();
+            CreationUser = Common.CurrentUser.UserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;

Config/Entities/Profile.cs

@@ -36,7 +36,7 @@ namespace Config.Entities
 			///
 			/// Default values
 			/// 
-            CreationUser = GlobalData.GetCurrentUserName();
+            CreationUser = CurrentUser.UserName();
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
@@ -78,6 +78,8 @@ namespace Config.Entities
 			output.WriteLine(CreationTime.ToString(CultureInfo.InvariantCulture));
             output.WriteLine(LastChgUser);
 			output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture));
+            output.WriteLine(((sbyte)ProfileType).ToString());
+            output.WriteLine(((sbyte)ErrorLimitType).ToString());
 
             foreach (var test in Tests) { test.Export(output); }
             output.WriteLine();
@@ -96,7 +98,8 @@ namespace Config.Entities
 			result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
             result.LastChgUser = input.ReadLine();
 			result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            string line = input.ReadLine();
+            result.ProfileType = (ProfileType)sbyte.Parse(input.ReadLine());
+            result.ErrorLimitType = (ErrorLimitType)sbyte.Parse(input.ReadLine());
 
             while (true)
             {

Config/Entities/Test.cs

@@ -22,11 +22,11 @@ namespace Config.Entities
         public virtual TestProfile Profile { get; set; }    /// UserDefined, Protected, UserDefinedHeatMeter, ProtectedHeatMeter
         public virtual sbyte Publish { get; set; }			/// 0=no, 1=in all protocols, 2=on screen, 3=internal
 		public virtual bool DoEvaluate { get; set; }
-        public virtual float Qtg { get; set; }              /// Target water flow [m3/h]
-        public virtual float Qfrom { get; set; }			/// Water flow low limit in [m3/h]
-        public virtual float Qto { get; set; }				/// Water flow high limit in [m3/h]
-		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
-        public virtual float TestTime { get; set; }			/// Test time (estimate) in [s]
+        public virtual double Qtg { get; set; }             /// Target water flow [m3/h]
+        public virtual double Qfrom { get; set; }			/// Water flow low limit in [m3/h]
+        public virtual double Qto { get; set; }				/// Water flow high limit in [m3/h]
+		public virtual double Volume { get; set; }			/// Test volume (target) in [l]
+        public virtual double TestTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
         public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -34,10 +34,10 @@ namespace Config.Entities
         public virtual int Repeats { get; set; }
         public virtual bool DoDraining { get; set; }
         public virtual bool DoDrainingAfter { get; set; }
-		public virtual bool DoControlWaterTemp { get; set; }
 		public virtual float TempLimLo { get; set; }		/// Lower limit for the controlled temperature
 		public virtual float TempLimHi { get; set; }		/// Upper limit for the controlled temperature
-		public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
+        public virtual string TempControl { get; set; }     /// Water temperature controller, null or empty = Do not control water temp
+        public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
         public virtual int MassRepeats { get; set; }		/// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
         public virtual float MassSpread { get; set; }		/// Max spread of mass. measurements at the beginning/end of test, 0 = default
 		public virtual MassMethod MassMethod { get; set; }	/// method of mass. measurement at the beginning/end of test: false=slow (precise), true=using immediate mass measurement and evaluation
@@ -90,15 +90,15 @@ namespace Config.Entities
             Profile = TestProfile.UserDefined;
             Publish = (sbyte)Common.Publish.Always;
 			DoEvaluate = true;
-			Repeats = 1;
+            ErrLimLo = -2.0f;				/// [%] lower error limit
+            ErrLimHi = 2.0f;				/// [%] upper error limit
+            Uncertainty = 0;
+            Repeats = 1;
 			DoDraining = false;
 			DoDrainingAfter = false;
-			DoControlWaterTemp = false;
 			TempLimLo = 15.0f;
 			TempLimHi = 25.0f;
-			ErrLimLo = -2.0f;				/// [%] lower error limit
-			ErrLimHi = 2.0f;				/// [%] upper error limit
-			Uncertainty = 0;
+            TempControl = string.Empty;
             PumpPower = 60.0f;				/// [%]
             MassRepeats = 0;				/// default
             MassSpread = 0;					/// default
@@ -168,10 +168,10 @@ namespace Config.Entities
 			result.Repeats = Repeats;
             result.DoDraining = DoDraining;
             result.DoDrainingAfter = DoDrainingAfter;
-			result.DoControlWaterTemp = DoControlWaterTemp;
 			result.TempLimLo = TempLimLo;
 			result.TempLimHi = TempLimHi;
-			result.PumpPower = PumpPower;
+            result.TempControl = TempControl;
+            result.PumpPower = PumpPower;
             result.MassRepeats = MassRepeats;
             result.MassSpread = MassSpread;
             result.MassMethod = MassMethod;
@@ -221,10 +221,10 @@ namespace Config.Entities
             output.WriteLine(Repeats.ToString(ci));
             output.WriteLine(DoDraining.ToString());
             output.WriteLine(DoDrainingAfter.ToString());
-			output.WriteLine(DoControlWaterTemp.ToString());
 			output.WriteLine(TempLimLo.ToString(ci));
 			output.WriteLine(TempLimHi.ToString(ci));
-			output.WriteLine(PumpPower.ToString(ci));
+            output.WriteLine((TempControl != null) ? TempControl : string.Empty);
+            output.WriteLine(PumpPower.ToString(ci));
             output.WriteLine(MassRepeats.ToString(ci));
             output.WriteLine(MassSpread.ToString(ci));
 			output.WriteLine(((byte)MassMethod).ToString(ci));
@@ -261,11 +261,11 @@ namespace Config.Entities
 			tst.Part = int.Parse(input.ReadLine(), ci);
 			tst.Publish = sbyte.Parse(input.ReadLine(), ci);
 			tst.DoEvaluate = bool.Parse(input.ReadLine());
-            tst.Qtg = float.Parse(input.ReadLine(), ci);
-            tst.Qfrom = float.Parse(input.ReadLine(), ci);
-			tst.Qto = float.Parse(input.ReadLine(), ci);
-			tst.Volume = float.Parse(input.ReadLine(), ci);
-			tst.TestTime = float.Parse(input.ReadLine(), ci);
+            tst.Qtg = double.Parse(input.ReadLine(), ci);
+            tst.Qfrom = double.Parse(input.ReadLine(), ci);
+            tst.Qto = double.Parse(input.ReadLine(), ci);
+            tst.Volume = double.Parse(input.ReadLine(), ci);
+            tst.TestTime = double.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -273,10 +273,10 @@ namespace Config.Entities
 			tst.Repeats = int.Parse(input.ReadLine(), ci);
             tst.DoDraining = bool.Parse(input.ReadLine());
 			tst.DoDrainingAfter = bool.Parse(input.ReadLine());
-			tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
 			tst.TempLimLo = float.Parse(input.ReadLine(), ci);
 			tst.TempLimHi = float.Parse(input.ReadLine(), ci);
-			tst.PumpPower = float.Parse(input.ReadLine(), ci);
+            tst.TempControl = input.ReadLine();
+            tst.PumpPower = float.Parse(input.ReadLine(), ci);
 			tst.MassRepeats = int.Parse(input.ReadLine(), ci);
 			tst.MassSpread = float.Parse(input.ReadLine(), ci);
 			tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), ci);
@@ -336,9 +336,9 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != Repeats.ToString(ci))            { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci))         { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci))    { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString())   { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci))          { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci))          { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TempControl)                  { diff.AppendFormat(fmt, "TempController", TempControl, ln); };
             ln = inp.ReadLine(); if (ln != PumpPower.ToString(ci))          { diff.AppendFormat(fmt, "PumpPower", PumpPower.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassRepeats.ToString(ci))        { diff.AppendFormat(fmt, "MassRepeats", MassRepeats.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != MassSpread.ToString(ci))         { diff.AppendFormat(fmt, "MassSpread", MassSpread.ToString(ci), ln); };

Config/Entities/User.cs

@@ -157,14 +157,14 @@ namespace Config.Entities
         /// <returns></ returns>
         public virtual bool IsPasswordExpired()
         {
-            if (IsPowerUser() || IsMemberOf(GID.Administrators) || GlobalData.PasswdExpirationPeriodDays == 0)
+            if (IsPowerUser() || IsMemberOf(GID.Administrators) || CurrentUser.PasswdExpirationPeriodDays == 0)
             {
                 /// Password cannot expirate for this user or this feature is disabled in Backup and Security options
                 return false;
             }
 
             /// Password expiration time is 3 months
-            return (DateTime.Now - LastPwChange > new TimeSpan(GlobalData.PasswdExpirationPeriodDays, 0, 0, 0));
+            return (DateTime.Now - LastPwChange > new TimeSpan(CurrentUser.PasswdExpirationPeriodDays, 0, 0, 0));
         }
 
         /// <summary>

Config/FluentCommon.cs

@@ -28,13 +28,13 @@ namespace Config
                 switch (dbType)
 				{
 					default:
-                    case DBType.SQLite:
-						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
-                        break;
                     case DBType.MySql:
                         cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                         break;
-				}
+                    case DBType.SQLite:
+                        cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
+                        break;
+                }
 
                 switch (database)
                 {
@@ -105,11 +105,11 @@ namespace Config
                     ///
                     var admin = new Config.Entities.User
                     {
-						UserName = GlobalData.AdminUsername,
+						UserName = CurrentUser.AdminUsername,
                         FullName = Strings.Administrator,
                         LastPwChange = DateTime.Now
                     };
-					admin.SetPassword(GlobalData.AdminPassword);
+					admin.SetPassword(CurrentUser.AdminPassword);
 
                     ///
                     /// Prepare all groups, add some of them to admin
@@ -128,7 +128,7 @@ namespace Config
                             case GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
                             case GID.TraceabilityManagement:
-#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
+#elif LANG_PL
                             case GID.MetrologicalAuthority:
                             case GID.WaterMeterAuthority:
 #endif

Config/Mappings/OutputPathMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -23,6 +23,7 @@ namespace Config.Mappings
             Map(x => x.Diverter);
 			Map(x => x.TempMtrDiv);
 			Map(x => x.Scale);
+            Map(x => x.RegVPositions);
 			Map(x => x.ValvesOpen)
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(8000)");

Config/Mappings/PTestMap.cs

@@ -24,6 +24,7 @@ namespace Config.Mappings
             Map(x => x.PressLimHi);
             Map(x => x.Publish);
             Map(x => x.Evaluate);
+            Map(x => x.Method);
             Map(x => x.E1);
             Map(x => x.E2);
             Map(x => x.E3);

Config/Mappings/TestMap.cs

@@ -25,10 +25,10 @@ namespace Config.Mappings
 			Map(x => x.Repeats);
             Map(x => x.DoDraining);
             Map(x => x.DoDrainingAfter);
-            Map(x => x.DoControlWaterTemp);
             Map(x => x.TempLimLo);
 			Map(x => x.TempLimHi);
-			Map(x => x.PumpPower);
+            Map(x => x.TempControl);
+            Map(x => x.PumpPower);
             Map(x => x.MassRepeats);
             Map(x => x.MassSpread);
 			Map(x => x.MassMethod)

DeviceTest/DeviceTestDlg.cs

@@ -423,7 +423,7 @@ namespace DeviceTest
 			{
 				parentCfg = parentFactory.DefaultConfig();
 			}
-            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+            ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
             cfgForm.CmpntEntities = new List<Config.Entities.Component>();
 
             IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
@@ -452,7 +452,7 @@ namespace DeviceTest
 			{
 				component1Cfg = component1Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -486,7 +486,7 @@ namespace DeviceTest
 			{
 				component2Cfg = component2Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -521,7 +521,7 @@ namespace DeviceTest
 			{
 				component3Cfg = component3Factory.DefaultConfig();
 			}
-			ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+			ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
 			///
 			var compEntities = new List<Config.Entities.Component>();
 			if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
@@ -678,11 +678,16 @@ namespace DeviceTest
 			{
 				operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent1forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+			else if (tbfComponent1forOp is TBF.Rig.Modbus.TempControl.Easytherm.TControl)
 			{
-				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(10);
+                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(20);
 			}
+            else if (tbfComponent1forOp is TBF.Rig.Modbus.TempControl.Novus.TControl)
+            {
+                operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(10);
+                operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(20);
+            }
             else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
                 operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
@@ -717,11 +722,16 @@ namespace DeviceTest
 			{
 				operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent2forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+            else if (tbfComponent2forOp is TBF.Rig.Modbus.TempControl.Easytherm.TControl)
 			{
-				operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(10);
+                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(20);
 			}
+            else if (tbfComponent2forOp is TBF.Rig.Modbus.TempControl.Novus.TControl)
+            {
+                operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(10);
+                operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(20);
+            }
             else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
                 operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
@@ -756,11 +766,16 @@ namespace DeviceTest
 			{
 				operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
 			}
-			else if (tbfComponent3forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
-			{
-				operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
-			}
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TempControl.Easytherm.TControl)
+            {
+                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(10);
+                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.TControl).SetTemperatureSetpointOp(20);
+            }
+            else if (tbfComponent3forOp is TBF.Rig.Modbus.TempControl.Novus.TControl)
+            {
+                operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(10);
+                operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Novus.TControl).SetTemperatureSetpointOp(20);
+            }
             else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
             {
                 operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
@@ -884,6 +899,8 @@ namespace DeviceTest
 		{
 			Cursor = Cursors.WaitCursor;
 
+            CurrentUser.Restore(this);
+
 			if (workerThread != null)
 			{
 				workerThreadRunning = false;

EventViewer/EventViewerWnd.cs

@@ -291,7 +291,7 @@ namespace EventViewer
         {
             try
             {
-                GlobalData.RemoteUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                CurrentUser.RemoteUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
                 SharedDatabase.Forms.LoginDlg dlg = new SharedDatabase.Forms.LoginDlg();
                 if (dlg.ShowDialog() == DialogResult.OK)
                 {

Events/Events.csproj

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5D9B49E3-CDF9-4A27-80B4-58141D0EB0E0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Events</RootNamespace>
-    <AssemblyName>Events</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentNHibernate">
-      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections">
-      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data">
-      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate">
-      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

FeatureVectorCalculator/CalculatorWnd.Designer.cs

@@ -30,21 +30,46 @@
         {
             this.rawFileComboBox = new System.Windows.Forms.ComboBox();
             this.browseButton = new System.Windows.Forms.Button();
-            this.processButton = new System.Windows.Forms.Button();
             this.resultsTextBox = new System.Windows.Forms.TextBox();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.tabPage4 = new System.Windows.Forms.TabPage();
+            this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.tabPage6 = new System.Windows.Forms.TabPage();
+            this.tabPage7 = new System.Windows.Forms.TabPage();
+            this.tabPage8 = new System.Windows.Forms.TabPage();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
+            this.splitContainer3.Panel1.SuspendLayout();
+            this.splitContainer3.Panel2.SuspendLayout();
+            this.splitContainer3.SuspendLayout();
+            this.tabControl1.SuspendLayout();
             this.SuspendLayout();
             // 
             // rawFileComboBox
             // 
+            this.rawFileComboBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rawFileComboBox.FormattingEnabled = true;
-            this.rawFileComboBox.Location = new System.Drawing.Point(29, 28);
+            this.rawFileComboBox.Location = new System.Drawing.Point(0, 0);
             this.rawFileComboBox.Name = "rawFileComboBox";
-            this.rawFileComboBox.Size = new System.Drawing.Size(715, 21);
+            this.rawFileComboBox.Size = new System.Drawing.Size(1040, 21);
             this.rawFileComboBox.TabIndex = 0;
             // 
             // browseButton
             // 
-            this.browseButton.Location = new System.Drawing.Point(769, 19);
+            this.browseButton.Location = new System.Drawing.Point(7, 0);
             this.browseButton.Name = "browseButton";
             this.browseButton.Size = new System.Drawing.Size(66, 37);
             this.browseButton.TabIndex = 1;
@@ -52,37 +77,184 @@
             this.browseButton.UseVisualStyleBackColor = true;
             this.browseButton.Click += new System.EventHandler(this.browseButton_Click);
             // 
-            // processButton
-            // 
-            this.processButton.Location = new System.Drawing.Point(29, 66);
-            this.processButton.Name = "processButton";
-            this.processButton.Size = new System.Drawing.Size(91, 46);
-            this.processButton.TabIndex = 2;
-            this.processButton.Text = "Process";
-            this.processButton.UseVisualStyleBackColor = true;
-            this.processButton.Click += new System.EventHandler(this.processButton_Click);
-            // 
             // resultsTextBox
             // 
-            this.resultsTextBox.Location = new System.Drawing.Point(29, 131);
+            this.resultsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.resultsTextBox.Location = new System.Drawing.Point(0, 0);
             this.resultsTextBox.Multiline = true;
             this.resultsTextBox.Name = "resultsTextBox";
-            this.resultsTextBox.Size = new System.Drawing.Size(715, 181);
+            this.resultsTextBox.Size = new System.Drawing.Size(1127, 156);
             this.resultsTextBox.TabIndex = 3;
             // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.tabControl1);
+            this.splitContainer1.Size = new System.Drawing.Size(1127, 733);
+            this.splitContainer1.SplitterDistance = 200;
+            this.splitContainer1.TabIndex = 4;
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.splitContainer3);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.resultsTextBox);
+            this.splitContainer2.Size = new System.Drawing.Size(1127, 200);
+            this.splitContainer2.SplitterDistance = 40;
+            this.splitContainer2.TabIndex = 3;
+            // 
+            // splitContainer3
+            // 
+            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer3.Name = "splitContainer3";
+            // 
+            // splitContainer3.Panel1
+            // 
+            this.splitContainer3.Panel1.Controls.Add(this.rawFileComboBox);
+            // 
+            // splitContainer3.Panel2
+            // 
+            this.splitContainer3.Panel2.Controls.Add(this.browseButton);
+            this.splitContainer3.Size = new System.Drawing.Size(1127, 40);
+            this.splitContainer3.SplitterDistance = 1040;
+            this.splitContainer3.TabIndex = 0;
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Controls.Add(this.tabPage3);
+            this.tabControl1.Controls.Add(this.tabPage4);
+            this.tabControl1.Controls.Add(this.tabPage5);
+            this.tabControl1.Controls.Add(this.tabPage6);
+            this.tabControl1.Controls.Add(this.tabPage7);
+            this.tabControl1.Controls.Add(this.tabPage8);
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.Location = new System.Drawing.Point(0, 0);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(1127, 529);
+            this.tabControl1.TabIndex = 0;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "OffsetV";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "KOhmsR";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "KOhmsC";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // tabPage4
+            // 
+            this.tabPage4.Location = new System.Drawing.Point(4, 22);
+            this.tabPage4.Name = "tabPage4";
+            this.tabPage4.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage4.TabIndex = 3;
+            this.tabPage4.Text = "DutFlowLph";
+            this.tabPage4.UseVisualStyleBackColor = true;
+            // 
+            // tabPage5
+            // 
+            this.tabPage5.Location = new System.Drawing.Point(4, 22);
+            this.tabPage5.Name = "tabPage5";
+            this.tabPage5.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage5.TabIndex = 4;
+            this.tabPage5.Text = "RefFlowLph";
+            this.tabPage5.UseVisualStyleBackColor = true;
+            // 
+            // tabPage6
+            // 
+            this.tabPage6.Location = new System.Drawing.Point(4, 22);
+            this.tabPage6.Name = "tabPage6";
+            this.tabPage6.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage6.TabIndex = 5;
+            this.tabPage6.Text = "FlowRatio";
+            this.tabPage6.UseVisualStyleBackColor = true;
+            // 
+            // tabPage7
+            // 
+            this.tabPage7.Location = new System.Drawing.Point(4, 22);
+            this.tabPage7.Name = "tabPage7";
+            this.tabPage7.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage7.TabIndex = 6;
+            this.tabPage7.Text = "MagField";
+            this.tabPage7.UseVisualStyleBackColor = true;
+            // 
+            // tabPage8
+            // 
+            this.tabPage8.Location = new System.Drawing.Point(4, 22);
+            this.tabPage8.Name = "tabPage8";
+            this.tabPage8.Size = new System.Drawing.Size(1119, 503);
+            this.tabPage8.TabIndex = 7;
+            this.tabPage8.Text = "EmfV";
+            this.tabPage8.UseVisualStyleBackColor = true;
+            // 
             // CalculatorWnd
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(859, 335);
-            this.Controls.Add(this.resultsTextBox);
-            this.Controls.Add(this.processButton);
-            this.Controls.Add(this.browseButton);
-            this.Controls.Add(this.rawFileComboBox);
+            this.ClientSize = new System.Drawing.Size(1127, 733);
+            this.Controls.Add(this.splitContainer1);
             this.Name = "CalculatorWnd";
             this.Text = "Feature vector calculator";
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            this.splitContainer2.Panel2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
+            this.splitContainer3.Panel1.ResumeLayout(false);
+            this.splitContainer3.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
+            this.splitContainer3.ResumeLayout(false);
+            this.tabControl1.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -90,8 +262,19 @@
 
         private System.Windows.Forms.ComboBox rawFileComboBox;
         private System.Windows.Forms.Button browseButton;
-        private System.Windows.Forms.Button processButton;
         private System.Windows.Forms.TextBox resultsTextBox;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private System.Windows.Forms.SplitContainer splitContainer3;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.TabPage tabPage4;
+        private System.Windows.Forms.TabPage tabPage5;
+        private System.Windows.Forms.TabPage tabPage6;
+        private System.Windows.Forms.TabPage tabPage7;
+        private System.Windows.Forms.TabPage tabPage8;
     }
 }
 

FeatureVectorCalculator/CalculatorWnd.cs

@@ -4,13 +4,20 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
+using System.Windows.Forms.DataVisualization.Charting;
 using Common.Iperl;
+using System.Globalization;
+using System.Drawing;
 
 namespace FeatureVectorCalculator
 {
     public partial class CalculatorWnd : Form
     {
         public const int MaxOptoDataCount = 40000;
+        public const bool Downsample = true;
+        public const bool Extend = true;
+
+
         OptoTelegramRaw[] optoData;
         Int64 volumeRawExtLast;
         Int64 timestampExtLast;
@@ -27,63 +34,115 @@ namespace FeatureVectorCalculator
             }
         }
 
+        void ClearOutput()
+        {
+            resultsTextBox.Clear();
+            tabControl1.TabPages[0].Controls.Clear();
+            tabControl1.TabPages[1].Controls.Clear();
+            tabControl1.TabPages[2].Controls.Clear();
+            tabControl1.TabPages[3].Controls.Clear();
+            tabControl1.TabPages[4].Controls.Clear();
+            tabControl1.TabPages[5].Controls.Clear();
+            tabControl1.TabPages[6].Controls.Clear();
+            tabControl1.TabPages[7].Controls.Clear();
+        }
+
         private void browseButton_Click(object sender, EventArgs e)
         {
             OpenFileDialog ofd = new OpenFileDialog();
-            var dr = ofd.ShowDialog();
-            rawFileComboBox.Text = ofd.FileName;
+
+            if (ofd.ShowDialog() == DialogResult.OK)
+            {
+                rawFileComboBox.Text = ofd.FileName;
+                ProcessRawDataFile(ofd.FileName);
+            }
         }
 
-        private void processButton_Click(object sender, EventArgs e)
+        void ProcessRawDataFile(string fileName)
         {
-            if (optoData == null) return;
-
             int counter = 0;
             int startIx = -1;
             int endIx = -1;
 
-            using (StreamReader reader = new StreamReader(rawFileComboBox.Text))
+            ClearOutput();
+
+            resultsTextBox.Text = string.Format("File name: {0}{1}", fileName, Environment.NewLine);
+
+            try
             {
-                string line;
-                while ((line = reader.ReadLine()) != null && counter < MaxOptoDataCount)
+                using (StreamReader reader = new StreamReader(fileName))
                 {
-                    int ix = line.IndexOf(" :\t");
-                    
-                    if (ix >= 0)
+                    string line;
+                    while ((line = reader.ReadLine()) != null && counter < MaxOptoDataCount)
                     {
-                        if (optoData[counter].UpdateFromString(line.Substring(ix + 3), counter, 0, ref volumeRawExtLast, ref timestampExtLast, true))
+                        int ix = line.IndexOf(" :\t");
+                        string[] items = line.Split('\t');
+
+                        if (items.Length > 18)
                         {
-                            if (line.EndsWith("####  start test  ####"))
+                            string telegram = string.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\r\n",
+                                                            items[2], items[3], items[4], items[5], items[6], items[7], items[8]);
+
+                            if (optoData[counter].UpdateFromString(telegram, counter, 0, ref volumeRawExtLast, ref timestampExtLast))
                             {
-                                startIx = counter;
-                                optoData[counter].Flags = OptoTelegramFlags.OK_TestStart;
-                            }
-                            else if (line.EndsWith("####  end of test  ####"))
-                            {
-                                endIx = counter;
-                                optoData[counter].Flags = OptoTelegramFlags.OK_TestEnd;
+                                if (line.EndsWith("####  start test  ####"))
+                                {
+                                    startIx = counter;
+                                    optoData[counter].Flags = OptoTelegramFlags.OK_TestStart;
+                                }
+                                else if (line.EndsWith("####  end of test  ####"))
+                                {
+                                    endIx = counter;
+                                    optoData[counter].Flags = OptoTelegramFlags.OK_TestEnd;
+                                }
+                                else
+                                {
+                                    optoData[counter].Flags = OptoTelegramFlags.OK;
+                                }
                             }
+
+                            optoData[counter].RefFlow = float.Parse(items[15].Replace(',', '.'), CultureInfo.InvariantCulture);
                         }
-                    }
-                    else
-                    {
-                        optoData[counter].Flags = OptoTelegramFlags.InvalidTelegram;
+                        else
+                        {
+                            optoData[counter].Flags = OptoTelegramFlags.InvalidTelegram;
+                        }
+
+                        counter++;
                     }
 
-                    counter++;
+                    reader.Close();
                 }
-
-                reader.Close();
             }
-
-            float[] featureVector = new float[9];
-            Common.Utils.CalculateFeatureVector(optoData, counter, startIx, endIx, ref featureVector);
-
-            resultsTextBox.Clear();
-            for (int i = 0; i < 9; i++)
+            catch (Exception exc)
             {
-                resultsTextBox.Text += string.Format("X{0} = {1}\r\n", i + 1, featureVector[i]);
+                MessageBox.Show(string.Format("Exception: {0}", exc.Message));
+                return;
             }
+
+            int start = Extend ? 0 : startIx;
+            int end = Extend ? (counter - 1) : endIx;
+            float[] offsetV, kOhmsR, kOhmsC, dutFlow, refFlow, flowRatio, magField, emfV;
+            PointF[] outliers, extendedOutliers;
+            float[] featureVector = Common.StatisticalMetrics.Calculate(optoData, counter, start, end, Downsample,
+                                                                        out offsetV, out kOhmsR, out kOhmsC, out dutFlow,
+                                                                        out refFlow, out flowRatio, out magField, out emfV,
+                                                                        out outliers, out extendedOutliers);
+
+            for (int i = 0; i < Math.Min(9, featureVector.Length); i++)
+            {
+                resultsTextBox.Text += string.Format("X{0} = {1}{2}", i + 1, featureVector[i], Environment.NewLine);
+            }
+
+            float period = Downsample ? 0.5F : 0.125F;
+            if (offsetV != null)   tabControl1.TabPages[0].Controls.Add(SignalChart.GetChart(offsetV,   period, "OffsetV",   "OffsetV [μV]"));
+            if (kOhmsR != null)    tabControl1.TabPages[1].Controls.Add(SignalChart.GetChart(kOhmsR,    period, "kOhmsR",    "kΩ"));
+            if (kOhmsC != null)    tabControl1.TabPages[2].Controls.Add(SignalChart.GetChart(kOhmsC,    period, "kOhmsC",    "kΩ"));
+            if (dutFlow != null)   tabControl1.TabPages[3].Controls.Add(SignalChart.GetChart(dutFlow,   period, "dutFlow",   "L/h"));
+            if (refFlow != null)   tabControl1.TabPages[4].Controls.Add(SignalChart.GetChart(refFlow,   period, "refFlow",   "L/h"));
+            if (flowRatio != null) tabControl1.TabPages[5].Controls.Add(SignalChart.GetChart(flowRatio, period, "flowRatio", "", true, extendedOutliers, outliers));
+            if (magField != null)  tabControl1.TabPages[6].Controls.Add(SignalChart.GetChart(magField,  period, "magField",  "μV", false));
+            if (emfV != null)      tabControl1.TabPages[7].Controls.Add(SignalChart.GetChart(emfV,      period, "emfV",      "μV"));
         }
     }
 }

FeatureVectorCalculator/FeatureVectorCalculator.csproj

@@ -37,6 +37,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -55,6 +56,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SignalChart.cs" />
     <EmbeddedResource Include="CalculatorWnd.resx">
       <DependentUpon>CalculatorWnd.cs</DependentUpon>
     </EmbeddedResource>

FeatureVectorCalculator/SignalChart.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.DataVisualization.Charting;
+
+namespace FeatureVectorCalculator
+{
+    public class SignalChart
+    {
+        public static Chart GetChart(float[] data, float period, string caption, string captionY, bool fromZero = true,
+                                     PointF[] extendedOutliers = null, PointF[] outliers = null)
+        {
+            Series series1 = null, series2 = null, series3 = null;
+
+            series1 = new Series { Name = caption, ChartArea = "area1", ChartType = SeriesChartType.Line, Color = Color.DeepSkyBlue };
+            float minY = float.MaxValue;
+            float maxY = float.MinValue;
+            for (int x = 0; x < data.Length; x++)
+            {
+                float y = data[x];
+                if (minY > y) minY = y;
+                if (maxY < y) maxY = y;
+                series1.Points.AddXY(x * period, y);
+            }
+
+            if (extendedOutliers != null)
+            {
+                series2 = new Series { Name = "extended outliers", ChartArea = "area1", ChartType = SeriesChartType.Point, Color = Color.Yellow };
+                for (int i = 0; i < extendedOutliers.Length; i++)
+                {
+                    series2.Points.AddXY(extendedOutliers[i].X * period, extendedOutliers[i].Y);
+                }
+            }
+
+            if (outliers != null)
+            {
+                series3 = new Series { Name = "outliers", ChartArea = "area1", ChartType = SeriesChartType.Point, Color = Color.DarkRed };
+                for (int i = 0; i < outliers.Length; i++)
+                {
+                    series3.Points.AddXY(outliers[i].X * period, outliers[i].Y);
+                }
+            }
+
+            ChartArea chArea = new ChartArea { Name = "area1" };            
+            chArea.AxisX.Title = "Time [s]";
+            chArea.AxisX.IsLogarithmic = false;
+            chArea.AxisX.IsLabelAutoFit = true;
+            chArea.AxisX.Minimum = 0;
+            chArea.AxisX.Maximum = (data.Length - 1) * period;
+            // for (int j = i; j < i + 3; j++)
+            // {
+            //     CustomLabel cl = new CustomLabel();
+            //     cl.Text = string.Format("{0} {1}", xs[j], flowUnit.ToDescription());
+            //     cl.FromPosition = Math.Log10(xs[j] * spacer);
+            //     cl.ToPosition = Math.Log10(xs[j] / spacer);
+            //     chArea.AxisX.CustomLabels.Add(cl);
+            // }
+
+            chArea.AxisY.Title = captionY;
+            chArea.AxisY.IsLogarithmic = false;
+            chArea.AxisY.IsLabelAutoFit = true;
+            
+            if (!fromZero)
+            {
+                /// fromZero = false
+                chArea.AxisY.IsStartedFromZero = false;
+                float diff = maxY - minY;
+                chArea.AxisY.Minimum = minY - 0.05 * diff;
+                chArea.AxisY.Maximum = maxY + 0.05 * diff;
+            }
+            else if (minY >= 0)
+            {
+                /// fromZero = true, All points are above zero
+                chArea.AxisY.IsStartedFromZero = true;
+                chArea.AxisY.Minimum = 0;
+                chArea.AxisY.Maximum = 1.05 * maxY;
+            }
+            else if (maxY <= 0)
+            {
+                /// fromZero = true, All points are below zero
+                chArea.AxisY.IsStartedFromZero = true;
+                chArea.AxisY.Minimum = 1.05 * minY;
+                chArea.AxisY.Maximum = 0;
+            }
+            else
+            {
+                /// Points are both below and above zero
+                chArea.AxisY.IsStartedFromZero = false;
+                float diff = maxY - minY;
+                chArea.AxisY.Minimum = minY - 0.05 * diff;
+                chArea.AxisY.Maximum = maxY + 0.05 * diff;
+            }
+            
+            if (chArea.AxisY.Maximum == chArea.AxisY.Minimum)
+            {
+                chArea.AxisY.Maximum = chArea.AxisY.Maximum + 1;
+            }
+
+            Chart chart = new Chart { Text = caption, Dock = DockStyle.Fill };
+            chart.ChartAreas.Add(chArea);
+            chart.Series.Add(series1);
+            if (series2 != null) chart.Series.Add(series2);
+            if (series3 != null) chart.Series.Add(series3);
+
+            return chart;
+        }
+    }
+}

GenCode128/GenCode128.csproj

@@ -35,7 +35,7 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -76,6 +76,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -99,6 +100,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System">

GenericTest/GenericTestDlg.Designer.cs

@@ -130,7 +130,7 @@
             this.vertSplitContainer.Panel2.Controls.Add(this.startButton);
             this.vertSplitContainer.Panel2.Controls.Add(this.stopButton);
             this.vertSplitContainer.Size = new System.Drawing.Size(1033, 151);
-            this.vertSplitContainer.SplitterDistance = 942;
+            this.vertSplitContainer.SplitterDistance = 945;
             this.vertSplitContainer.SplitterWidth = 1;
             this.vertSplitContainer.TabIndex = 2;
             // 
@@ -140,7 +140,7 @@
             this.resultsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.resultsGroupBox.Location = new System.Drawing.Point(0, 0);
             this.resultsGroupBox.Name = "resultsGroupBox";
-            this.resultsGroupBox.Size = new System.Drawing.Size(942, 151);
+            this.resultsGroupBox.Size = new System.Drawing.Size(945, 151);
             this.resultsGroupBox.TabIndex = 1;
             this.resultsGroupBox.TabStop = false;
             this.resultsGroupBox.Text = "Aktivita";
@@ -152,7 +152,7 @@
             this.activityListView.Location = new System.Drawing.Point(3, 16);
             this.activityListView.Name = "activityListView";
             this.activityListView.Scrollable = false;
-            this.activityListView.Size = new System.Drawing.Size(936, 132);
+            this.activityListView.Size = new System.Drawing.Size(939, 132);
             this.activityListView.TabIndex = 0;
             this.activityListView.UseCompatibleStateImageBehavior = false;
             this.activityListView.View = System.Windows.Forms.View.Details;
@@ -239,7 +239,6 @@
             this.ClientSize = new System.Drawing.Size(1164, 207);
             this.Controls.Add(this.splitContainer1);
             this.MaximizeBox = false;
-            this.MinimizeBox = false;
             this.Name = "GenericTestDlg";
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.Text = "RF Power New / Oracle / Printing";

GenericTest/GenericTestDlg.cs

@@ -176,13 +176,11 @@ namespace GenericTest
 
         private void settingsButton_Click(object sender, EventArgs e)
         {
-            IUser oriUser = GlobalData.CurrentUser;     /// Save the original user (= tester)
-
-            if (new LoginDlg(Program.SettingsAccessLevel).ShowDialog() == DialogResult.OK)
+            if (new LoginDlg(Program.SettingsAccessLevel, this).ShowDialog() == DialogResult.OK)
             {
                 /// Logged in at 'TraceabilityManagement' level
 
-                GlobalData.CurrentUser = oriUser;                     /// Restore the original user (= tester)
+                CurrentUser.Restore(this);                     /// Restore the original user (= tester)
 
                 string oriWorkplace = Program.LocalSettings.Workplace;
                 ///
@@ -195,7 +193,7 @@ namespace GenericTest
                         TracingDB.UnregisterWorkplaceObsolete(dbSession, oriWorkplace);
                         TracingDB.RegisterWorkplaceObsolete(dbSession,
                                                             Program.LocalSettings.Workplace,
-                                                            GlobalData.GetCurrentUserName(),
+                                                            CurrentUser.UserName(),
                                                             "1.2.3.4",
                                                             "<multiple>",
                                                             WorkflowStep,
@@ -714,14 +712,14 @@ namespace GenericTest
 
             if (!string.IsNullOrEmpty(Program.LocalSettings.UsersDBConnString))
             {
-                GlobalData.LocalUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                CurrentUser.LocalUsersDB = new DBSettings(DBType.MySql, Program.LocalSettings.UsersDBConnString);
             }
 
             UpdateTitle();
 
             TracingDB.RegisterWorkplaceObsolete(dbSession,
                                                 Program.LocalSettings.Workplace,
-                                                GlobalData.GetCurrentUserName(),
+                                                CurrentUser.UserName(),
                                                 "1.2.3.4",
                                                 "<multiple>",
                                                 WorkflowStep,
@@ -1037,7 +1035,7 @@ namespace GenericTest
 
         void UpdateTitle()
         {
-            Text = string.Format("{0} v.{1} ({2}, {3})", DfltWorkplaceName, Program.Version, Program.LocalSettings.Workplace, GlobalData.GetCurrentUserName());
+            Text = string.Format("{0} v.{1} ({2}, {3})", DfltWorkplaceName, Program.Version, Program.LocalSettings.Workplace, CurrentUser.UserName());
         }
     }
 }

GenericTest/Program.cs

@@ -153,7 +153,7 @@ namespace GenericTest
             {
                 try
                 {
-                    GlobalData.LocalUsersDB = new DBSettings(DBType.MySql, LocalSettings.UsersDBConnString);
+                    CurrentUser.LocalUsersDB = new DBSettings(DBType.MySql, LocalSettings.UsersDBConnString);
 
                     if (new SharedDatabase.Forms.LoginDlg().ShowDialog() != DialogResult.OK) return;
                 }

GenericTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("GenericTest")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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("3.0.1")]
-[assembly: AssemblyFileVersion("3.0.1")]
+[assembly: AssemblyVersion("3.0.2")]
+[assembly: AssemblyFileVersion("3.0.2")]

OrderManagement/EditOrderDlg.cs

@@ -1,20 +1,23 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
+using log4net;
+using NHibernate;
 using SharedDatabase;
 using SharedDatabase.Entities;
 using OrderManagement.Resources;
-using NHibernate;
 
 namespace OrderManagement
 {
     public partial class EditOrderDlg : Form
     {
-        ISession session;
+        private static readonly ILog log = LogManager.GetLogger(typeof(EditOrderDlg));
+
+        ISessionFactory sessionFactory;
         OrderInfo oriOrder;
         IList<OrderInfo> listOfOrders;
         bool isEnablePredefinedOrders;
@@ -22,11 +25,11 @@ namespace OrderManagement
 
         EditParametersCtrl editParametersCtrl;
 
-        public EditOrderDlg(ISession session, OrderInfo order, IList<OrderInfo> listOfOrders, bool isEnablePredefinedOrders = false, bool editMode = false)
+        public EditOrderDlg(ISessionFactory sessionFactory, OrderInfo order, IList<OrderInfo> listOfOrders, bool isEnablePredefinedOrders = false, bool editMode = false)
         {
             InitializeComponent();
 
-            this.session = session;
+            this.sessionFactory = sessionFactory;
             this.oriOrder = order;
             this.listOfOrders = listOfOrders;
             this.isEnablePredefinedOrders = isEnablePredefinedOrders;
@@ -51,9 +54,10 @@ namespace OrderManagement
         {
             OrderInfo modifiedOrder = editParametersCtrl.ParamsProvider as OrderInfo;
 
-            int modifiedOrderNr;
-            if (!isEnablePredefinedOrders &&
-                (!int.TryParse(modifiedOrder.POName, out modifiedOrderNr) || modifiedOrderNr <= OrderManagementDlg.MaxPredefinedOrderNr))
+            long modifiedOrderNr;
+            if (!long.TryParse(modifiedOrder.POName, out modifiedOrderNr) ||
+                modifiedOrderNr <= 0 ||
+                (!isEnablePredefinedOrders && modifiedOrderNr <= OrderManagementDlg.MaxPredefinedOrderNr))
             {
                 MessageBox.Show(string.Format(Strings.Order_number_must_be_larger_then_0, OrderManagementDlg.MaxPredefinedOrderNr));
                 return;
@@ -72,10 +76,55 @@ namespace OrderManagement
                 return;
             }
 
-            modifiedOrder.CopyContentTo(oriOrder);
+            Cursor.Current = Cursors.WaitCursor;
 
-            if (Save(oriOrder))
+            ITransaction transaction = null;
+            bool oriOrdermodified = false;
+            bool saved = false;
+            try
             {
+                ISession session = sessionFactory.OpenSession();
+                transaction = session.BeginTransaction();
+
+                var list = (oriOrder.Id != 0)
+                         ? session.QueryOver<OrderInfo>().Where(x => x.Id == oriOrder.Id).List()
+                         : new List<OrderInfo> { oriOrder };
+
+                if (list.Count != 1)
+                {
+                    transaction.Rollback();
+                }
+                else if (list[0].Equals(oriOrder, true))
+                {
+                    modifiedOrder.CopyContentTo(list[0], true);
+                    session.SaveOrUpdate(list[0]);
+                    transaction.Commit();
+                    session.Flush();
+                    list[0].CopyContentTo(oriOrder, false);
+                    saved = true;
+                }
+                else
+                {
+                    list[0].CopyContentTo(oriOrder, false);
+                    transaction.Rollback();
+                    oriOrdermodified = true;
+                }
+            }
+            catch (Exception exc)
+            {
+                if (transaction != null) transaction.Rollback();
+                log.ErrorFormat("Saving an order failed: {1}", exc.Message);
+            }
+
+            Cursor.Current = Cursors.Default;
+
+            if (saved)
+            {
+                DialogResult = DialogResult.OK;
+            }
+            else if (oriOrdermodified)
+            {
+                MessageBox.Show("Original order was modified by someone else,\r\ntry to adit this order once again");
                 DialogResult = DialogResult.OK;
             }
             else
@@ -87,34 +136,6 @@ namespace OrderManagement
             Close();
         }
 
-        /// <summary>
-        /// Saves the new or modified order to the database
-        /// </summary>
-        /// <returns>true when successful</returns>
-        bool Save(OrderInfo order)
-        {
-            ITransaction transaction = session.BeginTransaction();
-
-            try
-            {
-                Cursor.Current = Cursors.WaitCursor;
-
-                session.SaveOrUpdate(order);
-                transaction.Commit();
-                session.Flush();
-                Cursor.Current = Cursors.Default;
-                return true;
-            }
-            catch (Exception exc)
-            {
-                transaction.Rollback();
-                MessageBox.Show(string.Format("{0}{1}{2}", Strings.Saving_order_failed, Environment.NewLine, exc.Message),
-                                Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                Cursor.Current = Cursors.Default;
-                return false;
-            }
-        }
-
         private void cancelButton_Click(object sender, EventArgs e)
         {
             DialogResult = DialogResult.Cancel;
@@ -130,7 +151,7 @@ namespace OrderManagement
         /// <returns>false = OK, true = conflict (MessageBox appears before returning true)</returns>
         bool IsConflict(OrderInfo order, IList<OrderInfo> listOfOrders, OrderInfo orderToIgnore)
         {
-            if (order.POName[0] == '3')
+            if (order.POName.Length == 7 && order.POName[0] == '3')
             {
                 if (MessageBox.Show(string.Format("{0}\r\n{1}", Strings.It_is_not_recommended_that_orders_start_with_3,
                                                                 Strings.Abort_creating_an_order_QM),

OrderManagement/LocalSettings.cs

@@ -26,6 +26,7 @@ namespace OrderManagement
         public string Language;             /// User interface language used as CultureInfo(..) constructor argument
         public bool IsUserLoginRequired;    /// true = require user login on program start-up
         public bool IsShowPredefinedOrders; /// true = show predefined orders with nr. <= 1000
+        public bool IsShowFinishedOrders;   /// true = show finished orders
         public string TracingDBConnString;  /// Connection string to MySQL database with production tracing records
         public string UsersDBConnString;    /// Connection string to MySQL database with authorized users
         public string[] SapNumberHistory;   /// SAP number history
@@ -45,6 +46,7 @@ namespace OrderManagement
                 Language = "EN";
                 IsUserLoginRequired = false;
                 IsShowPredefinedOrders = false;
+                IsShowFinishedOrders = false;
 #if DEBUG
                 TracingDBConnString = "SERVER=localhost; DATABASE=nanjingshared; UID=root; PASSWORD=kraken; CHARSET=utf8;";
 #else

OrderManagement/OrderManagementDlg.Designer.cs

@@ -32,12 +32,13 @@
             this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.listViewEx1 = new Common.Forms.ListViewEx();
+            this.copyButton = new System.Windows.Forms.Button();
             this.printButton = new System.Windows.Forms.Button();
             this.addButton = new System.Windows.Forms.Button();
             this.editButton = new System.Windows.Forms.Button();
             this.closeButton = new System.Windows.Forms.Button();
             this.deleteButton = new System.Windows.Forms.Button();
-            this.copyButton = new System.Windows.Forms.Button();
+            this.finishButton = new System.Windows.Forms.Button();
             this.menuStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
@@ -75,6 +76,7 @@
             // 
             // splitContainer1.Panel2
             // 
+            this.splitContainer1.Panel2.Controls.Add(this.finishButton);
             this.splitContainer1.Panel2.Controls.Add(this.copyButton);
             this.splitContainer1.Panel2.Controls.Add(this.printButton);
             this.splitContainer1.Panel2.Controls.Add(this.addButton);
@@ -92,6 +94,7 @@
             this.listViewEx1.DoubleClickActivation = false;
             this.listViewEx1.FullRowSelect = true;
             this.listViewEx1.GridLines = true;
+            this.listViewEx1.HideSelection = false;
             this.listViewEx1.Location = new System.Drawing.Point(0, 0);
             this.listViewEx1.Name = "listViewEx1";
             this.listViewEx1.Size = new System.Drawing.Size(1214, 481);
@@ -101,10 +104,21 @@
             this.listViewEx1.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewEx1_ColumnClick);
             this.listViewEx1.DoubleClick += new System.EventHandler(this.listViewEx1_DoubleClick);
             // 
+            // copyButton
+            // 
+            this.copyButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.copyButton.Location = new System.Drawing.Point(23, 223);
+            this.copyButton.Name = "copyButton";
+            this.copyButton.Size = new System.Drawing.Size(85, 40);
+            this.copyButton.TabIndex = 7;
+            this.copyButton.Text = "Copy";
+            this.copyButton.UseVisualStyleBackColor = true;
+            this.copyButton.Click += new System.EventHandler(this.copyButton_Click);
+            // 
             // printButton
             // 
             this.printButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.printButton.Location = new System.Drawing.Point(23, 290);
+            this.printButton.Location = new System.Drawing.Point(23, 335);
             this.printButton.Name = "printButton";
             this.printButton.Size = new System.Drawing.Size(85, 40);
             this.printButton.TabIndex = 6;
@@ -148,7 +162,7 @@
             // deleteButton
             // 
             this.deleteButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.deleteButton.Location = new System.Drawing.Point(23, 223);
+            this.deleteButton.Location = new System.Drawing.Point(23, 268);
             this.deleteButton.Name = "deleteButton";
             this.deleteButton.Size = new System.Drawing.Size(85, 40);
             this.deleteButton.TabIndex = 5;
@@ -156,16 +170,16 @@
             this.deleteButton.UseVisualStyleBackColor = true;
             this.deleteButton.Click += new System.EventHandler(this.deleteButton_Click);
             // 
-            // copyButton
+            // finishButton
             // 
-            this.copyButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.copyButton.Location = new System.Drawing.Point(23, 178);
-            this.copyButton.Name = "copyButton";
-            this.copyButton.Size = new System.Drawing.Size(85, 40);
-            this.copyButton.TabIndex = 7;
-            this.copyButton.Text = "Copy";
-            this.copyButton.UseVisualStyleBackColor = true;
-            this.copyButton.Click += new System.EventHandler(this.copyButton_Click);
+            this.finishButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.finishButton.Location = new System.Drawing.Point(23, 178);
+            this.finishButton.Name = "finishButton";
+            this.finishButton.Size = new System.Drawing.Size(85, 40);
+            this.finishButton.TabIndex = 8;
+            this.finishButton.Text = "Finish";
+            this.finishButton.UseVisualStyleBackColor = true;
+            this.finishButton.Click += new System.EventHandler(this.finishButton_Click);
             // 
             // OrderManagementDlg
             // 
@@ -203,6 +217,7 @@
         private Common.Forms.ListViewEx listViewEx1;
         private System.Windows.Forms.Button printButton;
         private System.Windows.Forms.Button copyButton;
+        private System.Windows.Forms.Button finishButton;
     }
 }
 

OrderManagement/OrderManagementDlg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -10,6 +10,7 @@ using Common;
 using SharedDatabase.Entities;
 using OrderManagement.Resources;
 using Common.Forms;
+using SharedDatabase;
 
 namespace OrderManagement
 {
@@ -17,9 +18,9 @@ namespace OrderManagement
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(OrderManagementDlg));
 
-        public const int MaxPredefinedOrderNr = 1000; 
+        public const long MaxPredefinedOrderNr = 1000;
 
-        ISession session;
+        ISessionFactory sessionFactory;
         IList<OrderInfo> listOfOrders;
         IList<Process> listOfWorkflows;
 
@@ -46,10 +47,10 @@ namespace OrderManagement
             Text = string.Format("{0} v.{1}", Program.ProgramName, Program.Version); ;
         }
 
-        public OrderManagementDlg(ISession session, IList<OrderInfo> listOfOrders, IList<Process> listOfWorkflows)
+        public OrderManagementDlg(ISessionFactory sessionFactory, IList<OrderInfo> listOfOrders, IList<Process> listOfWorkflows)
             : this()
         {
-            this.session = session;
+            this.sessionFactory = sessionFactory;
             this.listOfOrders = listOfOrders;
             this.listOfWorkflows = listOfWorkflows;
         }
@@ -78,13 +79,22 @@ namespace OrderManagement
 
         void Localize()
         {
+            Text = string.Format("{0} ver.{1}", Strings.Order_Management, Program.Version);
             settingsToolStripMenuItem.Text = Strings.Settings;
+            closeButton.Text = Strings.Close;
+            addButton.Text = Strings.Add;
+            editButton.Text = Strings.Edit;
+            copyButton.Text = Strings.Copy;
+            deleteButton.Text = Strings.Delete;
+            printButton.Text = Strings.Print;
         }
 
         enum Clmn
         {
             Order,
             State,
+            Pieces,
+            CurrentPcs,
             Workflow,
             Procedure,
             Variant,
@@ -94,7 +104,6 @@ namespace OrderManagement
             ModuleParam,
             LaserMarking,
             Packing,
-            Pieces,
             SNPrefix,
             SNFirst,
             SNDigitsCount,
@@ -108,8 +117,10 @@ namespace OrderManagement
 
         void InitializeColumns(ListView lv)
         {
-            lv.Columns.Add(new ColumnHeader { Text = Strings.Order,                           Width = 65 });
-            lv.Columns.Add(new ColumnHeader { Text = Strings.State,                           Width = 65 });
+            lv.Columns.Add(new ColumnHeader { Text = Strings.Order,                           Width = 70 });
+            lv.Columns.Add(new ColumnHeader { Text = Strings.State,                           Width = 60 });
+            lv.Columns.Add(new ColumnHeader { Text = "Target",                                Width = 50 });
+            lv.Columns.Add(new ColumnHeader { Text = "Produced",                              Width = 60 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Workflow,                        Width = 100 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Test_procedure,                  Width = 200 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Variant_code,                    Width = 150 });
@@ -119,7 +130,6 @@ namespace OrderManagement
             lv.Columns.Add(new ColumnHeader { Text = Strings.Module_parameter,                Width = 100 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Laser_marking,                   Width = 100 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Packing,                         Width = 100 });
-            lv.Columns.Add(new ColumnHeader { Text = Strings.Pieces_count,                    Width = 80 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.prefix,       Width = 80 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.first,        Width = 80 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.digits_count, Width = 80 });
@@ -134,6 +144,8 @@ namespace OrderManagement
         {
             ListViewItem lvi = new ListViewItem(o.POName);
             lvi.SubItems.Add(((OrderState)o.POState).ToString());
+            lvi.SubItems.Add(o.PiecesCount.ToString());
+            lvi.SubItems.Add(o.CurrentPcsCount.ToString());
             lvi.SubItems.Add(o.Workflow);
             lvi.SubItems.Add(o.TestProcedure);
             lvi.SubItems.Add(o.VariantCode);
@@ -143,7 +155,6 @@ namespace OrderManagement
             lvi.SubItems.Add(o.ModuleParam);
             lvi.SubItems.Add(o.LaserMarking);
             lvi.SubItems.Add(o.Packing);
-            lvi.SubItems.Add(o.PiecesCount.ToString());
             lvi.SubItems.Add(o.SNPrefix);
             lvi.SubItems.Add(o.SNFirst.ToString(string.Format("D{0}", o.SNDigitsCount)));
             lvi.SubItems.Add(o.SNDigitsCount.ToString());
@@ -161,6 +172,8 @@ namespace OrderManagement
             int i = 0;
             lvi.SubItems[i++].Text = o.POName;
             lvi.SubItems[i++].Text = ((OrderState)o.POState).ToString();
+            lvi.SubItems[i++].Text = o.PiecesCount.ToString();
+            lvi.SubItems[i++].Text = o.CurrentPcsCount.ToString();
             lvi.SubItems[i++].Text = o.Workflow;
             lvi.SubItems[i++].Text = o.TestProcedure;
             lvi.SubItems[i++].Text = o.VariantCode;
@@ -170,7 +183,6 @@ namespace OrderManagement
             lvi.SubItems[i++].Text = o.ModuleParam;
             lvi.SubItems[i++].Text = o.LaserMarking;
             lvi.SubItems[i++].Text = o.Packing;
-            lvi.SubItems[i++].Text = o.PiecesCount.ToString();
             lvi.SubItems[i++].Text = o.SNPrefix;
             lvi.SubItems[i++].Text = o.SNFirst.ToString(string.Format("D{0}", o.SNDigitsCount));
             lvi.SubItems[i++].Text = o.SNDigitsCount.ToString();
@@ -185,7 +197,7 @@ namespace OrderManagement
         {
             try
             {
-                Common.GlobalData.RemoteUsersDB = new Common.DBSettings(Common.DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                Common.CurrentUser.RemoteUsersDB = new Common.DBSettings(Common.DBType.MySql, Program.LocalSettings.UsersDBConnString);
 
                 DialogResult dr = new SharedDatabase.Forms.LoginDlg().ShowDialog();
                 if (dr != DialogResult.OK) return;
@@ -232,7 +244,7 @@ namespace OrderManagement
             ///
             var order = new OrderInfo(candidatePOName);
 
-            if (new EditOrderDlg(session, order, listOfOrders, Program.LocalSettings.IsShowPredefinedOrders).ShowDialog()
+            if (new EditOrderDlg(sessionFactory, order, listOfOrders, Program.LocalSettings.IsShowPredefinedOrders).ShowDialog()
                  == DialogResult.OK)
             {
                 listOfOrders.Add(order);
@@ -251,7 +263,14 @@ namespace OrderManagement
             }
             else
             {
-                new OrderStateDlg(session, order).ShowDialog();
+                try
+                {
+                    new OrderStateDlg(order, sessionFactory).ShowDialog();
+                }
+                catch (Exception exc)
+                {
+                    log.ErrorFormat("Failed to read order {0} when creating OrderStateDlg: {1)", order.POName, exc.Message);
+                }
             }
         }
 
@@ -262,7 +281,7 @@ namespace OrderManagement
             OrderInfo order = listViewEx1.SelectedItems[0].Tag as OrderInfo;
             if (order.POState == (sbyte)OrderState.New)
             {
-                if (new EditOrderDlg(session, order, listOfOrders, Program.LocalSettings.IsShowPredefinedOrders, true).ShowDialog()
+                if (new EditOrderDlg(sessionFactory, order, listOfOrders, Program.LocalSettings.IsShowPredefinedOrders, true).ShowDialog()
                      == DialogResult.OK)
                 {
                     UpdateRow(listViewEx1.SelectedItems[0], order);
@@ -274,6 +293,46 @@ namespace OrderManagement
             }
         }
 
+        private void finishButton_Click(object sender, EventArgs e)
+        {
+            if (listViewEx1.SelectedItems.Count != 1 || !(listViewEx1.SelectedItems[0].Tag is OrderInfo)) return;
+
+            OrderInfo order = listViewEx1.SelectedItems[0].Tag as OrderInfo;
+            if (order.POState == (sbyte)OrderState.Active && order.CurrentPcsCount >= order.PiecesCount)
+            {
+                ISession session = null;
+                try
+                {
+                    session = sessionFactory.OpenSession();
+
+                    var selectedOrders = session.QueryOver<OrderInfo>()
+                                                .Where(x => x.Id == order.Id)
+                                                .List();
+
+                    if (selectedOrders.Count == 1)
+                    {
+                        selectedOrders[0].POState = (sbyte)OrderState.Finished;
+                        session.SaveOrUpdate(selectedOrders[0]);
+                        session.Flush();
+                        order.POState = (sbyte)OrderState.Finished;
+                        UpdateRow(listViewEx1.SelectedItems[0], order);
+                    }                      
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Changing production order state failed: {0}", ex.Message);
+                }
+                finally
+                {
+                    if (session != null && session.IsOpen) session.Close();
+                }
+            }
+            else
+            {
+                MessageBox.Show(Strings.You_can_only_finish_completed_production_orders);
+            }
+        }
+
         private void copyButton_Click(object sender, EventArgs e)
         {
             if (listViewEx1.SelectedItems.Count != 1 || !(listViewEx1.SelectedItems[0].Tag is OrderInfo)) return;
@@ -297,31 +356,31 @@ namespace OrderManagement
             ///
             /// Create and edit the order
             ///
-            OrderInfo newOrder = oriOrder.Clone() as OrderInfo;
-            newOrder.POName = candidatePOName;
-            newOrder.POState = (sbyte)OrderState.New;
-            newOrder.SNFirst = oriOrder.SNFirst + oriOrder.PiecesCount;     /// TODO
-            newOrder.RAFirst = oriOrder.RAFirst + oriOrder.PiecesCount;     /// TODO
-            newOrder.BaseNr1 = 0;
-            newOrder.BaseNr2 = 0;
-            newOrder.BaseNr3 = 0;
-            newOrder.BaseNr4 = 0;
-            newOrder.BaseNr5 = 0;
-            newOrder.CurrentPcsCount = 0;
-            newOrder.CurrentSN = 0;
-            newOrder.CurrentRA = 0;
-            newOrder.CurrentNr1 = 0;
-            newOrder.CurrentNr2 = 0;
-            newOrder.CurrentNr3 = 0;
-            newOrder.CurrentNr4 = 0;
-            newOrder.CurrentNr5 = 0;
-            newOrder.Remark = string.Format("Copy of order {0}", oriOrder.POName);
+            OrderInfo copiedOrder = oriOrder.Clone() as OrderInfo;
+            copiedOrder.POName = candidatePOName;
+            copiedOrder.POState = (sbyte)OrderState.New;
+            copiedOrder.SNFirst = oriOrder.SNFirst + oriOrder.PiecesCount;     /// TODO
+            copiedOrder.RAFirst = oriOrder.RAFirst + oriOrder.PiecesCount;     /// TODO
+            copiedOrder.BaseNr1 = 0;
+            copiedOrder.BaseNr2 = 0;
+            copiedOrder.BaseNr3 = 0;
+            copiedOrder.BaseNr4 = 0;
+            copiedOrder.BaseNr5 = 0;
+            copiedOrder.CurrentPcsCount = 0;
+            copiedOrder.CurrentSN = 0;
+            copiedOrder.CurrentRA = 0;
+            copiedOrder.CurrentNr1 = 0;
+            copiedOrder.CurrentNr2 = 0;
+            copiedOrder.CurrentNr3 = 0;
+            copiedOrder.CurrentNr4 = 0;
+            copiedOrder.CurrentNr5 = 0;
+            copiedOrder.Remark = string.Format("Copy of order {0}", oriOrder.POName);
 
-            if (new EditOrderDlg(session, newOrder, listOfOrders, Program.LocalSettings.IsShowPredefinedOrders).ShowDialog()
+            if (new EditOrderDlg(sessionFactory, copiedOrder, listOfOrders, Program.LocalSettings.IsShowPredefinedOrders).ShowDialog()
                  == DialogResult.OK)
             {
-                listOfOrders.Add(newOrder);
-                AddRow(listViewEx1, newOrder);
+                listOfOrders.Add(copiedOrder);
+                AddRow(listViewEx1, copiedOrder);
             }
         }
 
@@ -336,10 +395,29 @@ namespace OrderManagement
                 {
                     try
                     {
-                        session.Delete(order);
-                        session.Flush();
-                        listOfOrders.Remove(order);
-                        listViewEx1.Items.Remove(listViewEx1.SelectedItems[0]);
+                        ISession session = sessionFactory.OpenSession();
+                        var list = session.QueryOver<OrderInfo>().Where(x => x.Id == order.Id).List();
+                        if (list.Count == 1)
+                        {
+                            if (list[0].POState == (sbyte)OrderState.New)
+                            {
+                                session.Delete(list[0]);
+                                session.Flush();
+                                listOfOrders.Remove(order);
+                                listViewEx1.Items.Remove(listViewEx1.SelectedItems[0]);
+                            }
+                            else
+                            {
+                                MessageBox.Show(Strings.You_can_only_delete_New_porduction_orders);
+                            }
+                        }
+                        else
+                        {
+                            listOfOrders.Remove(order);
+                            listViewEx1.Items.Remove(listViewEx1.SelectedItems[0]);
+                            MessageBox.Show(Strings.Order_was_already_deleted);
+                        }
+                        session.Close();
                     }
                     catch (Exception exc)
                     {

OrderManagement/OrderStateDlg.Designer.cs

@@ -40,6 +40,7 @@
             this.currentSnLabel = new System.Windows.Forms.Label();
             this.currentRATextBox = new System.Windows.Forms.TextBox();
             this.currentRALabel = new System.Windows.Forms.Label();
+            this.closeButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // orderLabel
@@ -144,11 +145,23 @@
             this.currentRALabel.TabIndex = 10;
             this.currentRALabel.Text = "Last assigned radio address";
             // 
+            // closeButton
+            // 
+            this.closeButton.Location = new System.Drawing.Point(364, 23);
+            this.closeButton.Name = "closeButton";
+            this.closeButton.Size = new System.Drawing.Size(85, 43);
+            this.closeButton.TabIndex = 12;
+            this.closeButton.Text = "Close";
+            this.closeButton.UseVisualStyleBackColor = true;
+            this.closeButton.Click += new System.EventHandler(this.closeButton_Click);
+            // 
             // OrderStateDlg
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(479, 219);
+            this.ControlBox = false;
+            this.Controls.Add(this.closeButton);
             this.Controls.Add(this.currentRATextBox);
             this.Controls.Add(this.currentRALabel);
             this.Controls.Add(this.currentSnTextBox);
@@ -166,7 +179,7 @@
             this.Name = "OrderStateDlg";
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Order state";
+            this.Text = "Order State";
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -186,5 +199,6 @@
         private System.Windows.Forms.Label currentSnLabel;
         private System.Windows.Forms.TextBox currentRATextBox;
         private System.Windows.Forms.Label currentRALabel;
+        private System.Windows.Forms.Button closeButton;
     }
 }

OrderManagement/OrderStateDlg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Windows.Forms;
@@ -11,35 +11,81 @@ namespace OrderManagement
 {
     public partial class OrderStateDlg : Form
     {
-        ISession session;
-        OrderInfo order;
+        ISessionFactory sessionFactory;
+        int orderId;
+        Timer timer;
 
-        public OrderStateDlg()
+        private OrderStateDlg()
         {
             InitializeComponent();
+            Localize();
         }
 
-        public OrderStateDlg(ISession session,OrderInfo order)
+        public OrderStateDlg(OrderInfo order, ISessionFactory sessionFactory)
             : this()
         {
-            this.session = session;
-            this.order = order;
-            Localize();
+            this.sessionFactory = sessionFactory;
+            this.orderId = order.Id;
 
-            orderTextBox.Text = order.POName;
-            stateTextBox.Text = ((OrderState)order.POState).ToString();
-            targetPcsCountTextBox.Text = order.PiecesCount.ToString();
-            producedPcsCountTextBox.Text = order.CurrentPcsCount.ToString();
-            currentSnTextBox.Text = (order.SNPrefix != null ? order.SNPrefix : string.Empty) + order.CurrentSN.ToString(string.Format("D{0}", order.SNDigitsCount))
-                                  + (order.SNSuffix != null ? order.SNSuffix : string.Empty);
-            currentRATextBox.Text = (order.RAPrefix != null ? order.RAPrefix : string.Empty) + order.CurrentRA.ToString(SharedDatabase.Const.RAFormat)
-                                  + (order.RASuffix != null ? order.RASuffix : string.Empty);
+            /// Update UI when this form is loaded
+            timer_Tick(null, null);
+
+            /// Timer for regular 5 second ticks
+            timer = new System.Windows.Forms.Timer();
+            timer.Interval = 5000; // ms
+            timer.Tick += new EventHandler(timer_Tick);
+            timer.Start();
+        }
+
+        void timer_Tick(object sender, EventArgs args)
+        {
+            try
+            {
+                var session = sessionFactory.OpenSession();
+                var list = session.QueryOver<OrderInfo>().Where(x => x.Id == orderId).List();
+                session.Close();
+
+                if (list.Count == 1) UpdateUI(list[0]);
+            }
+            catch
+            {
+                stateTextBox.Text = "---";
+                targetPcsCountTextBox.Text = "---";
+                producedPcsCountTextBox.Text = "---";
+                currentSnTextBox.Text = "---";
+                currentRATextBox.Text = "---";
+            }
+        }
+
+        void UpdateUI(OrderInfo o)
+        {
+            orderTextBox.Text = o.POName;
+            stateTextBox.Text = ((OrderState)o.POState).ToString();
+            targetPcsCountTextBox.Text = o.PiecesCount.ToString();
+            producedPcsCountTextBox.Text = o.CurrentPcsCount.ToString();
+            currentSnTextBox.Text = (o.SNPrefix != null ? o.SNPrefix : string.Empty)
+                                  + o.CurrentSN.ToString(string.Format("D{0}", o.SNDigitsCount))
+                                  + (o.SNSuffix != null ? o.SNSuffix : string.Empty);
+            currentRATextBox.Text = (o.RAPrefix != null ? o.RAPrefix : string.Empty)
+                                  + o.CurrentRA.ToString(SharedDatabase.Const.RAFormat)
+                                  + (o.RASuffix != null ? o.RASuffix : string.Empty);
         }
 
         void Localize()
         {
+            Text = Strings.Order_State;
             orderLabel.Text = Strings.Order;
             stateLabel.Text = Strings.State;
+            targetPcsCountLabel.Text = Strings.Target_quantity;
+            producedPcsCountLabel.Text = Strings.Produced_quantity;
+            currentSnLabel.Text = Strings.Last_assigned_serial_number;
+            currentRALabel.Text = Strings.Last_assigned_radio_address;
+            closeButton.Text = Strings.Close;
+        }
+
+        private void closeButton_Click(object sender, EventArgs e)
+        {
+            Close();
         }
     }
 }

OrderManagement/Program.cs

@@ -1,17 +1,20 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
+using FluentNHibernate.Cfg;
+using FluentNHibernate.Cfg.Db;
 using log4net;
 using NHibernate;
 using Common;
 using SharedDatabase;
 using SharedDatabase.Entities;
 using OrderManagement.Resources;
+using System.Linq;
 
 namespace OrderManagement
 {
@@ -158,7 +161,7 @@ namespace OrderManagement
             {
                 try
                 {
-                    Common.GlobalData.RemoteUsersDB = new DBSettings(Common.DBType.MySql, LocalSettings.UsersDBConnString);
+                    Common.CurrentUser.RemoteUsersDB = new DBSettings(Common.DBType.MySql, LocalSettings.UsersDBConnString);
 
                     DialogResult dr = new SharedDatabase.Forms.LoginDlg().ShowDialog();
                     if (dr != DialogResult.OK) return;
@@ -169,19 +172,36 @@ namespace OrderManagement
                 }
             }
 
-            ISession session;
+            ISessionFactory sessionFactory;
             IList<OrderInfo> listOfOrders = null;
             IList<Process> listOfWorkflows = null;
+
             while (true)
             {
                 try
                 {
-                    session = SharedDatabase.TracingDB.CreateSession(LocalSettings.TracingDBConnString);
-                    listOfOrders = session.QueryOver<OrderInfo>()
-                                          .List();
+                    sessionFactory = Fluently.Configure()
+                                             .Database(MySQLConfiguration.Standard.ConnectionString(LocalSettings.TracingDBConnString))
+                                             .Mappings(m => m.FluentMappings.AddFromAssemblyOf<SharedDatabase.Entities.Process>())
+                                             .ExposeConfiguration(BuildSchema).BuildSessionFactory();
+
+                    ISession session = sessionFactory.OpenSession();
+
+                    if (LocalSettings.IsShowFinishedOrders)
+                    {
+                        listOfOrders = session.QueryOver<OrderInfo>().List();
+                    }
+                    else
+                    {
+                        listOfOrders = session.QueryOver<OrderInfo>()
+                                              .Where(x => x.POState != (sbyte)OrderState.Finished)
+                                              .List();
+                    }
+
                     listOfWorkflows = session.QueryOver<Process>()
                                              .Where(x => x.ReleaseStatus != ReleaseStatus.Deactivated)
                                              .List();
+                    session.Close();
                     break;
                 }
                 catch (Exception exc)
@@ -207,7 +227,7 @@ namespace OrderManagement
 
             try
             {
-                OrderManagementDlg dlg = new OrderManagementDlg(session, listOfOrders, listOfWorkflows);
+                OrderManagementDlg dlg = new OrderManagementDlg(sessionFactory, listOfOrders, listOfWorkflows);
                 Application.Run(dlg);
             }
             catch (Exception e)
@@ -224,6 +244,12 @@ namespace OrderManagement
             }
         }
 
+        public static void BuildSchema(NHibernate.Cfg.Configuration config)
+        {
+            /// This NHibernate tool takes a configuration (with mapping info in)
+            /// and exports a database schema from it
+            new NHibernate.Tool.hbm2ddl.SchemaExport(config).SetOutputFile("db_schema");
+        }
 
         static void MyHandler(object sender, UnhandledExceptionEventArgs args)
         {

OrderManagement/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("OrderManagement")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyCopyright("Copyright ©  2021-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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("3.0.11.0")]
-[assembly: AssemblyFileVersion("3.0.11.0")]
+[assembly: AssemblyVersion("3.0.14.0")]
+[assembly: AssemblyFileVersion("3.0.14.0")]

OrderManagement/Resources/Strings.Designer.cs

@@ -19,7 +19,7 @@ namespace OrderManagement.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Strings {
@@ -69,6 +69,15 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Add.
+        /// </summary>
+        internal static string Add {
+            get {
+                return ResourceManager.GetString("Add", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Are you sure ?.
         /// </summary>
@@ -87,6 +96,15 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Close.
+        /// </summary>
+        internal static string Close {
+            get {
+                return ResourceManager.GetString("Close", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Close it please using &apos;Task manager&apos;.
         /// </summary>
@@ -114,6 +132,15 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Copy.
+        /// </summary>
+        internal static string Copy {
+            get {
+                return ResourceManager.GetString("Copy", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Database.
         /// </summary>
@@ -132,6 +159,15 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Delete.
+        /// </summary>
+        internal static string Delete {
+            get {
+                return ResourceManager.GetString("Delete", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to digits count.
         /// </summary>
@@ -141,6 +177,15 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Edit.
+        /// </summary>
+        internal static string Edit {
+            get {
+                return ResourceManager.GetString("Edit", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Error.
         /// </summary>
@@ -213,6 +258,24 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Last assigned radio address.
+        /// </summary>
+        internal static string Last_assigned_radio_address {
+            get {
+                return ResourceManager.GetString("Last_assigned_radio_address", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Last assigned serial number.
+        /// </summary>
+        internal static string Last_assigned_serial_number {
+            get {
+                return ResourceManager.GetString("Last_assigned_serial_number", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Last radio address.
         /// </summary>
@@ -267,6 +330,15 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Order Management.
+        /// </summary>
+        internal static string Order_Management {
+            get {
+                return ResourceManager.GetString("Order_Management", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Order number must be larger then {0}.
         /// </summary>
@@ -276,6 +348,24 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Order State.
+        /// </summary>
+        internal static string Order_State {
+            get {
+                return ResourceManager.GetString("Order_State", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Order was already deleted.
+        /// </summary>
+        internal static string Order_was_already_deleted {
+            get {
+                return ResourceManager.GetString("Order_was_already_deleted", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Order with the same ID already exists.
         /// </summary>
@@ -321,6 +411,24 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Print.
+        /// </summary>
+        internal static string Print {
+            get {
+                return ResourceManager.GetString("Print", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Produced quantity.
+        /// </summary>
+        internal static string Produced_quantity {
+            get {
+                return ResourceManager.GetString("Produced_quantity", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Producton order properties.
         /// </summary>
@@ -438,6 +546,15 @@ namespace OrderManagement.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Target quantity.
+        /// </summary>
+        internal static string Target_quantity {
+            get {
+                return ResourceManager.GetString("Target_quantity", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Test procedure.
         /// </summary>
@@ -520,7 +637,7 @@ namespace OrderManagement.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You can only delete &apos;New&apos; porduction orders.
+        ///   Looks up a localized string similar to You can only delete &apos;New&apos; production orders.
         /// </summary>
         internal static string You_can_only_delete_New_porduction_orders {
             get {
@@ -529,12 +646,21 @@ namespace OrderManagement.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You can only edit &apos;New&apos; porduction orders.
+        ///   Looks up a localized string similar to You can only edit &apos;New&apos; production orders.
         /// </summary>
         internal static string You_can_only_edit_New_porduction_orders {
             get {
                 return ResourceManager.GetString("You_can_only_edit_New_porduction_orders", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You can only finish completed production orders.
+        /// </summary>
+        internal static string You_can_only_finish_completed_production_orders {
+            get {
+                return ResourceManager.GetString("You_can_only_finish_completed_production_orders", resourceCulture);
+            }
+        }
     }
 }

OrderManagement/Resources/Strings.resx

@@ -223,10 +223,10 @@
     <value>S/N</value>
   </data>
   <data name="You_can_only_edit_New_porduction_orders" xml:space="preserve">
-    <value>You can only edit 'New' porduction orders</value>
+    <value>You can only edit 'New' production orders</value>
   </data>
   <data name="You_can_only_delete_New_porduction_orders" xml:space="preserve">
-    <value>You can only delete 'New' porduction orders</value>
+    <value>You can only delete 'New' production orders</value>
   </data>
   <data name="Laser_marking" xml:space="preserve">
     <value>Laser marking</value>
@@ -276,4 +276,46 @@
   <data name="Year_of_calibration" xml:space="preserve">
     <value>Year of calibration</value>
   </data>
+  <data name="Order_was_already_deleted" xml:space="preserve">
+    <value>Order was already deleted</value>
+  </data>
+  <data name="Close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="Last_assigned_radio_address" xml:space="preserve">
+    <value>Last assigned radio address</value>
+  </data>
+  <data name="Last_assigned_serial_number" xml:space="preserve">
+    <value>Last assigned serial number</value>
+  </data>
+  <data name="Order_State" xml:space="preserve">
+    <value>Order State</value>
+  </data>
+  <data name="Produced_quantity" xml:space="preserve">
+    <value>Produced quantity</value>
+  </data>
+  <data name="Target_quantity" xml:space="preserve">
+    <value>Target quantity</value>
+  </data>
+  <data name="Add" xml:space="preserve">
+    <value>Add</value>
+  </data>
+  <data name="Copy" xml:space="preserve">
+    <value>Copy</value>
+  </data>
+  <data name="Delete" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Edit" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="Order_Management" xml:space="preserve">
+    <value>Order Management</value>
+  </data>
+  <data name="Print" xml:space="preserve">
+    <value>Print</value>
+  </data>
+  <data name="You_can_only_finish_completed_production_orders" xml:space="preserve">
+    <value>You can only finish completed production orders</value>
+  </data>
 </root>

OrderManagement/SettingsDlg.Designer.cs

@@ -29,6 +29,7 @@
         private void InitializeComponent()
         {
             this.commonGroupBox = new System.Windows.Forms.GroupBox();
+            this.showPredefinedOrdersCheckBox = new System.Windows.Forms.CheckBox();
             this.loginRequiredCheckBox = new System.Windows.Forms.CheckBox();
             this.languageComboBox = new System.Windows.Forms.ComboBox();
             this.languageLabel = new System.Windows.Forms.Label();
@@ -38,7 +39,7 @@
             this.usersDBConnStringTextBox = new System.Windows.Forms.TextBox();
             this.saveButton = new System.Windows.Forms.Button();
             this.cancelButton = new System.Windows.Forms.Button();
-            this.showPredefinedOrdersCheckBox = new System.Windows.Forms.CheckBox();
+            this.showFinishedOrdersCheckBox = new System.Windows.Forms.CheckBox();
             this.commonGroupBox.SuspendLayout();
             this.connStrForTracingGroupBox.SuspendLayout();
             this.connStrForUsersGroupBox.SuspendLayout();
@@ -46,6 +47,7 @@
             // 
             // commonGroupBox
             // 
+            this.commonGroupBox.Controls.Add(this.showFinishedOrdersCheckBox);
             this.commonGroupBox.Controls.Add(this.showPredefinedOrdersCheckBox);
             this.commonGroupBox.Controls.Add(this.loginRequiredCheckBox);
             this.commonGroupBox.Controls.Add(this.languageComboBox);
@@ -56,10 +58,20 @@
             this.commonGroupBox.TabIndex = 16;
             this.commonGroupBox.TabStop = false;
             // 
+            // showPredefinedOrdersCheckBox
+            // 
+            this.showPredefinedOrdersCheckBox.AutoSize = true;
+            this.showPredefinedOrdersCheckBox.Location = new System.Drawing.Point(22, 67);
+            this.showPredefinedOrdersCheckBox.Name = "showPredefinedOrdersCheckBox";
+            this.showPredefinedOrdersCheckBox.Size = new System.Drawing.Size(138, 17);
+            this.showPredefinedOrdersCheckBox.TabIndex = 3;
+            this.showPredefinedOrdersCheckBox.Text = "Show predefined orders";
+            this.showPredefinedOrdersCheckBox.UseVisualStyleBackColor = true;
+            // 
             // loginRequiredCheckBox
             // 
             this.loginRequiredCheckBox.AutoSize = true;
-            this.loginRequiredCheckBox.Location = new System.Drawing.Point(22, 55);
+            this.loginRequiredCheckBox.Location = new System.Drawing.Point(22, 45);
             this.loginRequiredCheckBox.Name = "loginRequiredCheckBox";
             this.loginRequiredCheckBox.Size = new System.Drawing.Size(114, 17);
             this.loginRequiredCheckBox.TabIndex = 2;
@@ -139,15 +151,15 @@
             this.cancelButton.UseVisualStyleBackColor = true;
             this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
             // 
-            // showPredefinedOrdersCheckBox
+            // showFinishedOrdersCheckBox
             // 
-            this.showPredefinedOrdersCheckBox.AutoSize = true;
-            this.showPredefinedOrdersCheckBox.Location = new System.Drawing.Point(22, 82);
-            this.showPredefinedOrdersCheckBox.Name = "showPredefinedOrdersCheckBox";
-            this.showPredefinedOrdersCheckBox.Size = new System.Drawing.Size(138, 17);
-            this.showPredefinedOrdersCheckBox.TabIndex = 3;
-            this.showPredefinedOrdersCheckBox.Text = "Show predefined orders";
-            this.showPredefinedOrdersCheckBox.UseVisualStyleBackColor = true;
+            this.showFinishedOrdersCheckBox.AutoSize = true;
+            this.showFinishedOrdersCheckBox.Location = new System.Drawing.Point(22, 89);
+            this.showFinishedOrdersCheckBox.Name = "showFinishedOrdersCheckBox";
+            this.showFinishedOrdersCheckBox.Size = new System.Drawing.Size(124, 17);
+            this.showFinishedOrdersCheckBox.TabIndex = 4;
+            this.showFinishedOrdersCheckBox.Text = "Show finished orders";
+            this.showFinishedOrdersCheckBox.UseVisualStyleBackColor = true;
             // 
             // SettingsDlg
             // 
@@ -188,5 +200,6 @@
         private System.Windows.Forms.Button saveButton;
         private System.Windows.Forms.Button cancelButton;
         private System.Windows.Forms.CheckBox showPredefinedOrdersCheckBox;
+        private System.Windows.Forms.CheckBox showFinishedOrdersCheckBox;
     }
 }

OrderManagement/SettingsDlg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Windows.Forms;
@@ -48,6 +48,7 @@ namespace OrderManagement
 
             loginRequiredCheckBox.Checked = ls.IsUserLoginRequired;
             showPredefinedOrdersCheckBox.Checked = ls.IsShowPredefinedOrders;
+            showFinishedOrdersCheckBox.Checked = ls.IsShowFinishedOrders;
 
             tracingDBConnStringTextBox.Text = ls.TracingDBConnString;
             usersDBConnStringTextBox.Text = ls.UsersDBConnString;
@@ -95,6 +96,12 @@ namespace OrderManagement
                 isDifferent = true;
             }
 
+            if (ls.IsShowFinishedOrders != showFinishedOrdersCheckBox.Checked)
+            {
+                ls.IsShowFinishedOrders = showFinishedOrdersCheckBox.Checked;
+                isDifferent = true;
+            }
+
             if (ls.TracingDBConnString != tracingDBConnStringTextBox.Text)
             {
                 ls.TracingDBConnString = tracingDBConnStringTextBox.Text;

ProductionTracing/FiltersConfig.cs

@@ -33,7 +33,16 @@ namespace ProductionTracing
 
         public FiltersConfig()
         {
-            ResultItems = new string[] { };
+            ResultItems = new string[]
+            {
+                "Code1~Housing s/n~{0}~~0",
+                "Code2~eRegister nr.~{0}~~0",
+                "Code3~S/N~{0}~~0",
+                "Code4~Radio address~{0}~~0",
+                "POrder~Order~{0}~~0",
+                "Workflow~Workflow~{0}~~0",
+                "Timestamp~Time stamp~{0:dd.MM.yyyy  HH:mm:ss}~~0"
+            };
         }
 
         /// <summary>

ProductionTracing/Forms/DatabaseSettingsDlg.Designer.cs

@@ -1,125 +0,0 @@
-namespace ProductionTracing.Forms
-{
-	partial class DatabaseSettingsDlg
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.connectionStringTextBox1 = new System.Windows.Forms.TextBox();
-            this.connectionStringLabel = new System.Windows.Forms.Label();
-            this.okButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.languageLabel = new System.Windows.Forms.Label();
-            this.languageTextBox = new System.Windows.Forms.TextBox();
-            this.SuspendLayout();
-            // 
-            // connectionStringTextBox1
-            // 
-            this.connectionStringTextBox1.Location = new System.Drawing.Point(29, 45);
-            this.connectionStringTextBox1.Name = "connectionStringTextBox1";
-            this.connectionStringTextBox1.Size = new System.Drawing.Size(595, 20);
-            this.connectionStringTextBox1.TabIndex = 0;
-            // 
-            // connectionStringLabel
-            // 
-            this.connectionStringLabel.AutoSize = true;
-            this.connectionStringLabel.Location = new System.Drawing.Point(26, 20);
-            this.connectionStringLabel.Name = "connectionStringLabel";
-            this.connectionStringLabel.Size = new System.Drawing.Size(89, 13);
-            this.connectionStringLabel.TabIndex = 3;
-            this.connectionStringLabel.Text = "Connection string";
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(418, 93);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(95, 38);
-            this.okButton.TabIndex = 6;
-            this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
-            this.okButton.Click += new System.EventHandler(this.okButton_Click);
-            // 
-            // cancelButton
-            // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(529, 93);
-            this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(95, 38);
-            this.cancelButton.TabIndex = 7;
-            this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
-            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-            // 
-            // languageLabel
-            // 
-            this.languageLabel.AutoSize = true;
-            this.languageLabel.Location = new System.Drawing.Point(26, 83);
-            this.languageLabel.Name = "languageLabel";
-            this.languageLabel.Size = new System.Drawing.Size(55, 13);
-            this.languageLabel.TabIndex = 11;
-            this.languageLabel.Text = "Language";
-            // 
-            // languageTextBox
-            // 
-            this.languageTextBox.Location = new System.Drawing.Point(29, 107);
-            this.languageTextBox.Name = "languageTextBox";
-            this.languageTextBox.Size = new System.Drawing.Size(100, 20);
-            this.languageTextBox.TabIndex = 12;
-            // 
-            // DatabaseSettingsDlg
-            // 
-            this.AcceptButton = this.okButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(655, 152);
-            this.Controls.Add(this.languageTextBox);
-            this.Controls.Add(this.languageLabel);
-            this.Controls.Add(this.cancelButton);
-            this.Controls.Add(this.okButton);
-            this.Controls.Add(this.connectionStringLabel);
-            this.Controls.Add(this.connectionStringTextBox1);
-            this.Name = "DatabaseSettingsDlg";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Database Settings";
-            this.Load += new System.EventHandler(this.DatabaseSettings_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-        private System.Windows.Forms.TextBox connectionStringTextBox1;
-        private System.Windows.Forms.Label connectionStringLabel;
-		private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.Label languageLabel;
-        private System.Windows.Forms.TextBox languageTextBox;
-	}
-}

ProductionTracing/Forms/DatabaseSettingsDlg.cs

@@ -1,60 +0,0 @@
-///
-/// Copyright (c) 2022 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using ProductionTracing.Resources;
-
-namespace ProductionTracing.Forms
-{
-	public partial class DatabaseSettingsDlg : Form
-	{
-        private LocalSettings ls;
-
-        public DatabaseSettingsDlg()
-		{
-			InitializeComponent();
-		}
-
-        public DatabaseSettingsDlg(LocalSettings ls)
-        {
-            this.ls = ls;
-            InitializeComponent();
-        }
-
-		private void DatabaseSettings_Load(object sender, EventArgs e)
-		{
-            Localize();
-
-            if (ls == null) return;
-            
-            connectionStringTextBox1.Text = ls.ConnectionString;
-            languageTextBox.Text = ls.Language;
-		}
-
-        void Localize()
-        {
-            Text = Strings.Settings;
-            connectionStringLabel.Text = Strings.Connection_string;   /// TODO: Use resources
-            languageLabel.Text = Strings.Language;
-            okButton.Text = Strings.OkBtnText;
-            cancelButton.Text = Strings.CancelBtnText;
-        }
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-            ls.ConnectionString = connectionStringTextBox1.Text;
-            ls.Language = languageTextBox.Text;
-			ls.Save();
-
-			DialogResult = DialogResult.OK;
-			Close();
-		}
-
-		private void cancelButton_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-	}
-}

ProductionTracing/Forms/SettingsDlg.Designer.cs

@@ -0,0 +1,179 @@
+namespace ProductionTracing.Forms
+{
+    partial class SettingsDlg
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.commonGroupBox = new System.Windows.Forms.GroupBox();
+            this.loginRequiredCheckBox = new System.Windows.Forms.CheckBox();
+            this.languageComboBox = new System.Windows.Forms.ComboBox();
+            this.languageLabel = new System.Windows.Forms.Label();
+            this.connStrForTracingGroupBox = new System.Windows.Forms.GroupBox();
+            this.tracingDBConnStringTextBox = new System.Windows.Forms.TextBox();
+            this.connStrForUsersGroupBox = new System.Windows.Forms.GroupBox();
+            this.usersDBConnStringTextBox = new System.Windows.Forms.TextBox();
+            this.saveButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.commonGroupBox.SuspendLayout();
+            this.connStrForTracingGroupBox.SuspendLayout();
+            this.connStrForUsersGroupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // commonGroupBox
+            // 
+            this.commonGroupBox.Controls.Add(this.languageComboBox);
+            this.commonGroupBox.Controls.Add(this.languageLabel);
+            this.commonGroupBox.Location = new System.Drawing.Point(12, 161);
+            this.commonGroupBox.Name = "commonGroupBox";
+            this.commonGroupBox.Size = new System.Drawing.Size(418, 53);
+            this.commonGroupBox.TabIndex = 16;
+            this.commonGroupBox.TabStop = false;
+            // 
+            // loginRequiredCheckBox
+            // 
+            this.loginRequiredCheckBox.AutoSize = true;
+            this.loginRequiredCheckBox.Location = new System.Drawing.Point(19, 46);
+            this.loginRequiredCheckBox.Name = "loginRequiredCheckBox";
+            this.loginRequiredCheckBox.Size = new System.Drawing.Size(114, 17);
+            this.loginRequiredCheckBox.TabIndex = 2;
+            this.loginRequiredCheckBox.Text = "User login required";
+            this.loginRequiredCheckBox.UseVisualStyleBackColor = true;
+            // 
+            // languageComboBox
+            // 
+            this.languageComboBox.FormattingEnabled = true;
+            this.languageComboBox.Location = new System.Drawing.Point(292, 19);
+            this.languageComboBox.Name = "languageComboBox";
+            this.languageComboBox.Size = new System.Drawing.Size(80, 21);
+            this.languageComboBox.TabIndex = 1;
+            // 
+            // languageLabel
+            // 
+            this.languageLabel.AutoSize = true;
+            this.languageLabel.Location = new System.Drawing.Point(19, 23);
+            this.languageLabel.Name = "languageLabel";
+            this.languageLabel.Size = new System.Drawing.Size(134, 13);
+            this.languageLabel.TabIndex = 0;
+            this.languageLabel.Text = "Language, Sprache, Jazyk";
+            // 
+            // connStrForTracingGroupBox
+            // 
+            this.connStrForTracingGroupBox.Controls.Add(this.tracingDBConnStringTextBox);
+            this.connStrForTracingGroupBox.Location = new System.Drawing.Point(12, 14);
+            this.connStrForTracingGroupBox.Name = "connStrForTracingGroupBox";
+            this.connStrForTracingGroupBox.Size = new System.Drawing.Size(660, 50);
+            this.connStrForTracingGroupBox.TabIndex = 17;
+            this.connStrForTracingGroupBox.TabStop = false;
+            this.connStrForTracingGroupBox.Text = "Connection string for production tracing records";
+            // 
+            // tracingDBConnStringTextBox
+            // 
+            this.tracingDBConnStringTextBox.Location = new System.Drawing.Point(19, 18);
+            this.tracingDBConnStringTextBox.Name = "tracingDBConnStringTextBox";
+            this.tracingDBConnStringTextBox.Size = new System.Drawing.Size(617, 20);
+            this.tracingDBConnStringTextBox.TabIndex = 0;
+            // 
+            // connStrForUsersGroupBox
+            // 
+            this.connStrForUsersGroupBox.Controls.Add(this.loginRequiredCheckBox);
+            this.connStrForUsersGroupBox.Controls.Add(this.usersDBConnStringTextBox);
+            this.connStrForUsersGroupBox.Location = new System.Drawing.Point(12, 73);
+            this.connStrForUsersGroupBox.Name = "connStrForUsersGroupBox";
+            this.connStrForUsersGroupBox.Size = new System.Drawing.Size(660, 70);
+            this.connStrForUsersGroupBox.TabIndex = 18;
+            this.connStrForUsersGroupBox.TabStop = false;
+            this.connStrForUsersGroupBox.Text = "Connection string for central DB of users";
+            // 
+            // usersDBConnStringTextBox
+            // 
+            this.usersDBConnStringTextBox.Location = new System.Drawing.Point(19, 18);
+            this.usersDBConnStringTextBox.Name = "usersDBConnStringTextBox";
+            this.usersDBConnStringTextBox.Size = new System.Drawing.Size(617, 20);
+            this.usersDBConnStringTextBox.TabIndex = 0;
+            // 
+            // saveButton
+            // 
+            this.saveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.saveButton.Location = new System.Drawing.Point(475, 166);
+            this.saveButton.Name = "saveButton";
+            this.saveButton.Size = new System.Drawing.Size(74, 47);
+            this.saveButton.TabIndex = 19;
+            this.saveButton.Text = "Save";
+            this.saveButton.UseVisualStyleBackColor = true;
+            this.saveButton.Click += new System.EventHandler(this.saveButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.Location = new System.Drawing.Point(577, 166);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(71, 47);
+            this.cancelButton.TabIndex = 20;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+            // 
+            // SettingsDlg
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(688, 237);
+            this.ControlBox = false;
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.saveButton);
+            this.Controls.Add(this.connStrForUsersGroupBox);
+            this.Controls.Add(this.connStrForTracingGroupBox);
+            this.Controls.Add(this.commonGroupBox);
+            this.Name = "SettingsDlg";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Settings";
+            this.Load += new System.EventHandler(this.SettingsDlg_Load);
+            this.commonGroupBox.ResumeLayout(false);
+            this.commonGroupBox.PerformLayout();
+            this.connStrForTracingGroupBox.ResumeLayout(false);
+            this.connStrForTracingGroupBox.PerformLayout();
+            this.connStrForUsersGroupBox.ResumeLayout(false);
+            this.connStrForUsersGroupBox.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox commonGroupBox;
+        private System.Windows.Forms.ComboBox languageComboBox;
+        private System.Windows.Forms.Label languageLabel;
+        private System.Windows.Forms.CheckBox loginRequiredCheckBox;
+        private System.Windows.Forms.GroupBox connStrForTracingGroupBox;
+        private System.Windows.Forms.TextBox tracingDBConnStringTextBox;
+        private System.Windows.Forms.GroupBox connStrForUsersGroupBox;
+        private System.Windows.Forms.TextBox usersDBConnStringTextBox;
+        private System.Windows.Forms.Button saveButton;
+        private System.Windows.Forms.Button cancelButton;
+    }
+}

ProductionTracing/Forms/SettingsDlg.cs

@@ -0,0 +1,126 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+using System.Windows.Forms;
+using ProductionTracing.Resources;
+
+namespace ProductionTracing.Forms
+{
+    public partial class SettingsDlg : Form
+    {
+        private LocalSettings ls;
+
+        public SettingsDlg()
+        {
+            InitializeComponent();
+        }
+
+        public SettingsDlg(LocalSettings localSettings)
+        {
+            InitializeComponent();
+            this.ls = localSettings;
+        }
+
+        void Localize()
+        {
+            Text = Strings.Settings;
+            languageLabel.Text = Strings.Language;
+            loginRequiredCheckBox.Text = Strings.User_login_is_required;
+            saveButton.Text = Strings.Save;
+            cancelButton.Text = Strings.Cancel;
+            connStrForTracingGroupBox.Text = Strings.Connection_string_tracing_DB;
+            connStrForUsersGroupBox.Text = Strings.Connection_string_users_DB;
+        }
+
+        private void SettingsDlg_Load(object sender, EventArgs e)
+        {
+            Localize();
+
+            if (ls == null) return;
+
+            languageComboBox.Items.Add("EN");
+            languageComboBox.Items.Add("ZH_CN");
+            languageComboBox.Items.Add("DE");
+            languageComboBox.Items.Add("SK");
+            languageComboBox.Text = ls.Language;
+
+            loginRequiredCheckBox.Checked = ls.IsUserLoginRequired;
+
+            tracingDBConnStringTextBox.Text = ls.ConnectionString;
+            usersDBConnStringTextBox.Text = ls.UsersDBConnString;
+        }
+
+        /// <summary>
+        /// Verifies UI content
+        /// </summary>
+        /// <returns>None-empty string (message) when invalid</returns>
+        string IsUIContentValid()
+        {
+            if (!languageComboBox.Items.Contains(languageComboBox.Text))
+            {
+                return "Invalid language";
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Updates settings, checks for differences compared to previous setrtings
+        /// </summary>
+        /// <returns>true when settings are different</returns>
+        bool UpdateSettings()
+        {
+            if (ls == null) return false;
+
+            bool isDifferent = false;
+
+            if (ls.Language != languageComboBox.Text)
+            {
+                ls.Language = languageComboBox.Text;
+                isDifferent = true;
+            }
+
+            if (ls.IsUserLoginRequired != loginRequiredCheckBox.Checked)
+            {
+                ls.IsUserLoginRequired = loginRequiredCheckBox.Checked;
+                isDifferent = true;
+            }
+
+            if (ls.ConnectionString != tracingDBConnStringTextBox.Text)
+            {
+                ls.ConnectionString = tracingDBConnStringTextBox.Text;
+                isDifferent = true;
+            }
+
+            if (ls.UsersDBConnString != usersDBConnStringTextBox.Text)
+            {
+                ls.UsersDBConnString = usersDBConnStringTextBox.Text;
+                isDifferent = true;
+            }
+
+            return isDifferent;
+        }
+
+        private void saveButton_Click(object sender, EventArgs e)
+        {
+            string message = IsUIContentValid();
+            if (string.IsNullOrEmpty(message))
+            {
+                UpdateSettings();
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            else
+            {
+                MessageBox.Show(message);
+            }
+        }
+
+        private void cancelButton_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

ProductionTracing/Forms/StatisticsOptionsDlg.cs

@@ -77,7 +77,7 @@ namespace ProductionTracing.Forms
         {
             Text = Strings.Statistics;
             okButton.Text = Strings.OkBtnText;
-            cancelButton.Text = Strings.CancelBtnText;
+            cancelButton.Text = Strings.Cancel;
             rowsGroupBox.Text = Strings.Rows;
             columnsGroupBox.Text = Strings.Columns;
         }

ProductionTracing/Forms/TracingConfigDlg.cs

@@ -48,7 +48,7 @@ namespace ProductionTracing.Forms
 			removeButton.Text = Strings.Remove;
 			removeAllButton.Text = Strings.Remove_all;
 			okButton.Text = Strings.OkBtnText;
-			cancelButton.Text = Strings.CancelBtnText;
+			cancelButton.Text = Strings.Cancel;
             upButton.Text = Strings.UpBtnText;
             downButton.Text = Strings.DownBtnText;
 		}

ProductionTracing/ItemSpec.cs

@@ -186,7 +186,6 @@ namespace ProductionTracing
             {
                 default:
                 case ItemSpecID.RefRecordId: return Projections.Property(() => refRecord.Id);
-
                 case ItemSpecID.POrder:      return Projections.Property(() => refRecord.POName);
                 case ItemSpecID.Workflow:    return Projections.Property(() => refRecord.Workflow);
                 case ItemSpecID.Timestamp:   return Projections.Property(() => refRecord.Timestamp);

ProductionTracing/LocalSettings.cs

@@ -29,9 +29,11 @@ namespace ProductionTracing
 		/// User interface language (used as CultureInfo(..) constructor argument).
 		/// </summary>
         public string Language;
+        public bool IsUserLoginRequired;
 
         /// Database settings of servers.
 		public string ConnectionString;
+        public string UsersDBConnString;
 
         /// Statistics options
         public bool TwoDim;
@@ -48,6 +50,16 @@ namespace ProductionTracing
         public int MainWndHeight;
         public bool MainWndMaximized;
 
+        /// History of texts entered in ComboBoxes
+        public string[] Combo1History;
+        public string[] Combo2History;
+        public string[] Combo4History;
+        public string[] Combo5History;
+        public string[] Combo6History;
+        public string[] Combo7History;
+        public string[] Combo8History;
+        public string[] Combo9History;
+
         /// Last configuration file name
         public string LastConfigFileName;
 
@@ -68,10 +80,13 @@ namespace ProductionTracing
             if (createNew)
             {
                 Language = "EN";
+                IsUserLoginRequired = false;
 #if DEBUG
                 ConnectionString = "SERVER=localhost; DATABASE=nanjingshared; UID=root; PASSWORD=kraken; CHARSET=utf8;";
+                UsersDBConnString = "SERVER=localhost; DATABASE=nanjingshared; UID=root; PASSWORD=kraken; CHARSET=utf8;";
 #else
                 ConnectionString = "SERVER=10.116.192.200; DATABASE=nanjingshared; UID=nanjingshared; PASSWORD=C1ern4V0d4; CHARSET=utf8;";
+                UsersDBConnString = "SERVER=10.116.192.200; DATABASE=nanjingshared; UID=nanjingshared; PASSWORD=C1ern4V0d4; CHARSET=utf8;";
 #endif
                 MainWndLeft = 20;
                 MainWndTop = 20;
@@ -192,6 +207,15 @@ namespace ProductionTracing
             }
         }
 
+        public static void PrepareCombo(System.Windows.Forms.ComboBox comboBox, string[] history)
+        {
+            if (history == null) history = new string[0];
+
+            for (int i = 0; i < history.Length; i++) comboBox.Items.Add(history[i]);
+
+            if (comboBox.Items.Count > 0) comboBox.Text = comboBox.Items[0].ToString();
+        }
+
 		/// <summary>
 		/// Updates history stored in a string array by a new latest string.
 		/// </summary>
@@ -235,13 +259,7 @@ namespace ProductionTracing
 				}
 				history = newHistory;
 			}
-			Save();
 			return true;
 		}
-
-        public string GetConnectionString()
-        {
-            return ConnectionString;
-        }
     }
 }

ProductionTracing/ProductionTracing.csproj

@@ -72,12 +72,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Forms\DatabaseSettingsDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\DatabaseSettingsDlg.Designer.cs">
-      <DependentUpon>DatabaseSettingsDlg.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\MoreInfoDlg.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -90,6 +84,12 @@
     <Compile Include="Forms\NoBenchOrDatabaseDlg.designer.cs">
       <DependentUpon>NoBenchOrDatabaseDlg.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\SettingsDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\SettingsDlg.designer.cs">
+      <DependentUpon>SettingsDlg.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\StatisticsDlg.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -125,15 +125,15 @@
     <Compile Include="ProductionTracingWnd.Designer.cs">
       <DependentUpon>ProductionTracingWnd.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="Forms\DatabaseSettingsDlg.resx">
-      <DependentUpon>DatabaseSettingsDlg.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\MoreInfoDlg.resx">
       <DependentUpon>MoreInfoDlg.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\NoBenchOrDatabaseDlg.resx">
       <DependentUpon>NoBenchOrDatabaseDlg.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\SettingsDlg.resx">
+      <DependentUpon>SettingsDlg.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\StatisticsDlg.resx">
       <DependentUpon>StatisticsDlg.cs</DependentUpon>
     </EmbeddedResource>

ProductionTracing/ProductionTracingWnd.Designer.cs

@@ -187,7 +187,7 @@
             // 
             this.hSplitContainer.Panel2.Controls.Add(this.tabControl);
             this.hSplitContainer.Size = new System.Drawing.Size(1246, 711);
-            this.hSplitContainer.SplitterDistance = 323;
+            this.hSplitContainer.SplitterDistance = 285;
             this.hSplitContainer.TabIndex = 0;
             // 
             // filtersItemsSplitContainer
@@ -203,7 +203,7 @@
             // filtersItemsSplitContainer.Panel2
             // 
             this.filtersItemsSplitContainer.Panel2.Controls.Add(this.itemsGroupBox);
-            this.filtersItemsSplitContainer.Size = new System.Drawing.Size(1246, 323);
+            this.filtersItemsSplitContainer.Size = new System.Drawing.Size(1246, 285);
             this.filtersItemsSplitContainer.SplitterDistance = 623;
             this.filtersItemsSplitContainer.TabIndex = 1;
             // 
@@ -214,7 +214,7 @@
             this.filtersGroupBox.Location = new System.Drawing.Point(0, 0);
             this.filtersGroupBox.Name = "filtersGroupBox";
             this.filtersGroupBox.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.filtersGroupBox.Size = new System.Drawing.Size(623, 323);
+            this.filtersGroupBox.Size = new System.Drawing.Size(623, 285);
             this.filtersGroupBox.TabIndex = 0;
             this.filtersGroupBox.TabStop = false;
             this.filtersGroupBox.Text = "Filters";
@@ -230,15 +230,15 @@
             // 
             // splitContainer1.Panel1
             // 
-            this.splitContainer1.Panel1.Controls.Add(this.groupBox1);
+            this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
             this.splitContainer1.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             // 
             // splitContainer1.Panel2
             // 
-            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
+            this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
             this.splitContainer1.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.splitContainer1.Size = new System.Drawing.Size(617, 304);
-            this.splitContainer1.SplitterDistance = 40;
+            this.splitContainer1.Size = new System.Drawing.Size(617, 266);
+            this.splitContainer1.SplitterDistance = 41;
             this.splitContainer1.TabIndex = 0;
             // 
             // groupBox1
@@ -248,14 +248,14 @@
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox1.Location = new System.Drawing.Point(0, 0);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(617, 40);
+            this.groupBox1.Size = new System.Drawing.Size(120, 41);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             // 
             // comboBox1
             // 
             this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(3, 16);
+            this.comboBox1.Location = new System.Drawing.Point(3, 17);
             this.comboBox1.Name = "comboBox1";
             this.comboBox1.Size = new System.Drawing.Size(114, 21);
             this.comboBox1.TabIndex = 1;
@@ -278,19 +278,18 @@
             this.splitContainer2.IsSplitterFixed = true;
             this.splitContainer2.Location = new System.Drawing.Point(0, 0);
             this.splitContainer2.Name = "splitContainer2";
-            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
             // splitContainer2.Panel1
             // 
-            this.splitContainer2.Panel1.Controls.Add(this.groupBox2);
+            this.splitContainer2.Panel1.Controls.Add(this.groupBox1);
             this.splitContainer2.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             // 
             // splitContainer2.Panel2
             // 
-            this.splitContainer2.Panel2.Controls.Add(this.splitContainer3);
+            this.splitContainer2.Panel2.Controls.Add(this.groupBox2);
             this.splitContainer2.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.splitContainer2.Size = new System.Drawing.Size(617, 260);
-            this.splitContainer2.SplitterDistance = 40;
+            this.splitContainer2.Size = new System.Drawing.Size(617, 41);
+            this.splitContainer2.SplitterDistance = 120;
             this.splitContainer2.TabIndex = 0;
             // 
             // groupBox2
@@ -300,7 +299,7 @@
             this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox2.Location = new System.Drawing.Point(0, 0);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(617, 40);
+            this.groupBox2.Size = new System.Drawing.Size(493, 41);
             this.groupBox2.TabIndex = 0;
             this.groupBox2.TabStop = false;
             // 
@@ -310,7 +309,7 @@
             this.comboBox2.FormattingEnabled = true;
             this.comboBox2.Location = new System.Drawing.Point(3, 16);
             this.comboBox2.Name = "comboBox2";
-            this.comboBox2.Size = new System.Drawing.Size(611, 21);
+            this.comboBox2.Size = new System.Drawing.Size(487, 21);
             this.comboBox2.TabIndex = 1;
             // 
             // checkBox2
@@ -340,8 +339,8 @@
             // splitContainer3.Panel2
             // 
             this.splitContainer3.Panel2.Controls.Add(this.v2SplitContainer);
-            this.splitContainer3.Size = new System.Drawing.Size(617, 216);
-            this.splitContainer3.SplitterDistance = 40;
+            this.splitContainer3.Size = new System.Drawing.Size(617, 221);
+            this.splitContainer3.SplitterDistance = 41;
             this.splitContainer3.TabIndex = 0;
             // 
             // groupBox3
@@ -357,7 +356,7 @@
             this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox3.Location = new System.Drawing.Point(0, 0);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(617, 40);
+            this.groupBox3.Size = new System.Drawing.Size(617, 41);
             this.groupBox3.TabIndex = 0;
             this.groupBox3.TabStop = false;
             // 
@@ -447,7 +446,7 @@
             // v2SplitContainer.Panel2
             // 
             this.v2SplitContainer.Panel2.Controls.Add(this.splitContainer4);
-            this.v2SplitContainer.Size = new System.Drawing.Size(617, 172);
+            this.v2SplitContainer.Size = new System.Drawing.Size(617, 176);
             this.v2SplitContainer.SplitterDistance = 120;
             this.v2SplitContainer.TabIndex = 0;
             // 
@@ -467,8 +466,8 @@
             // splitContainer8.Panel2
             // 
             this.splitContainer8.Panel2.Controls.Add(this.splitContainer9);
-            this.splitContainer8.Size = new System.Drawing.Size(120, 172);
-            this.splitContainer8.SplitterDistance = 40;
+            this.splitContainer8.Size = new System.Drawing.Size(120, 176);
+            this.splitContainer8.SplitterDistance = 41;
             this.splitContainer8.TabIndex = 0;
             // 
             // groupBox8
@@ -478,15 +477,14 @@
             this.groupBox8.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox8.Location = new System.Drawing.Point(0, 0);
             this.groupBox8.Name = "groupBox8";
-            this.groupBox8.Size = new System.Drawing.Size(120, 40);
+            this.groupBox8.Size = new System.Drawing.Size(120, 41);
             this.groupBox8.TabIndex = 0;
             this.groupBox8.TabStop = false;
             // 
             // comboBox8
             // 
-            this.comboBox8.Dock = System.Windows.Forms.DockStyle.Fill;
             this.comboBox8.FormattingEnabled = true;
-            this.comboBox8.Location = new System.Drawing.Point(3, 16);
+            this.comboBox8.Location = new System.Drawing.Point(3, 17);
             this.comboBox8.Name = "comboBox8";
             this.comboBox8.Size = new System.Drawing.Size(114, 21);
             this.comboBox8.TabIndex = 1;
@@ -514,8 +512,8 @@
             // splitContainer9.Panel1
             // 
             this.splitContainer9.Panel1.Controls.Add(this.groupBox9);
-            this.splitContainer9.Size = new System.Drawing.Size(120, 128);
-            this.splitContainer9.SplitterDistance = 40;
+            this.splitContainer9.Size = new System.Drawing.Size(120, 131);
+            this.splitContainer9.SplitterDistance = 41;
             this.splitContainer9.TabIndex = 0;
             // 
             // groupBox9
@@ -525,15 +523,14 @@
             this.groupBox9.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox9.Location = new System.Drawing.Point(0, 0);
             this.groupBox9.Name = "groupBox9";
-            this.groupBox9.Size = new System.Drawing.Size(120, 40);
+            this.groupBox9.Size = new System.Drawing.Size(120, 41);
             this.groupBox9.TabIndex = 0;
             this.groupBox9.TabStop = false;
             // 
             // comboBox9
             // 
-            this.comboBox9.Dock = System.Windows.Forms.DockStyle.Fill;
             this.comboBox9.FormattingEnabled = true;
-            this.comboBox9.Location = new System.Drawing.Point(3, 16);
+            this.comboBox9.Location = new System.Drawing.Point(3, 17);
             this.comboBox9.Name = "comboBox9";
             this.comboBox9.Size = new System.Drawing.Size(114, 21);
             this.comboBox9.TabIndex = 1;
@@ -565,8 +562,8 @@
             // splitContainer4.Panel2
             // 
             this.splitContainer4.Panel2.Controls.Add(this.splitContainer5);
-            this.splitContainer4.Size = new System.Drawing.Size(493, 172);
-            this.splitContainer4.SplitterDistance = 40;
+            this.splitContainer4.Size = new System.Drawing.Size(493, 176);
+            this.splitContainer4.SplitterDistance = 41;
             this.splitContainer4.TabIndex = 0;
             // 
             // groupBox4
@@ -576,14 +573,14 @@
             this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox4.Location = new System.Drawing.Point(0, 0);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(493, 40);
+            this.groupBox4.Size = new System.Drawing.Size(493, 41);
             this.groupBox4.TabIndex = 0;
             this.groupBox4.TabStop = false;
             // 
             // comboBox4
             // 
             this.comboBox4.FormattingEnabled = true;
-            this.comboBox4.Location = new System.Drawing.Point(3, 16);
+            this.comboBox4.Location = new System.Drawing.Point(3, 17);
             this.comboBox4.Name = "comboBox4";
             this.comboBox4.Size = new System.Drawing.Size(200, 21);
             this.comboBox4.TabIndex = 1;
@@ -615,8 +612,8 @@
             // splitContainer5.Panel2
             // 
             this.splitContainer5.Panel2.Controls.Add(this.splitContainer6);
-            this.splitContainer5.Size = new System.Drawing.Size(493, 128);
-            this.splitContainer5.SplitterDistance = 40;
+            this.splitContainer5.Size = new System.Drawing.Size(493, 131);
+            this.splitContainer5.SplitterDistance = 41;
             this.splitContainer5.TabIndex = 0;
             // 
             // groupBox5
@@ -626,14 +623,14 @@
             this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox5.Location = new System.Drawing.Point(0, 0);
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(493, 40);
+            this.groupBox5.Size = new System.Drawing.Size(493, 41);
             this.groupBox5.TabIndex = 0;
             this.groupBox5.TabStop = false;
             // 
             // comboBox5
             // 
             this.comboBox5.FormattingEnabled = true;
-            this.comboBox5.Location = new System.Drawing.Point(3, 16);
+            this.comboBox5.Location = new System.Drawing.Point(3, 17);
             this.comboBox5.Name = "comboBox5";
             this.comboBox5.Size = new System.Drawing.Size(200, 21);
             this.comboBox5.TabIndex = 2;
@@ -665,8 +662,8 @@
             // splitContainer6.Panel2
             // 
             this.splitContainer6.Panel2.Controls.Add(this.groupBox7);
-            this.splitContainer6.Size = new System.Drawing.Size(493, 84);
-            this.splitContainer6.SplitterDistance = 40;
+            this.splitContainer6.Size = new System.Drawing.Size(493, 86);
+            this.splitContainer6.SplitterDistance = 41;
             this.splitContainer6.TabIndex = 0;
             // 
             // groupBox6
@@ -676,14 +673,14 @@
             this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox6.Location = new System.Drawing.Point(0, 0);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(493, 40);
+            this.groupBox6.Size = new System.Drawing.Size(493, 41);
             this.groupBox6.TabIndex = 0;
             this.groupBox6.TabStop = false;
             // 
             // comboBox6
             // 
             this.comboBox6.FormattingEnabled = true;
-            this.comboBox6.Location = new System.Drawing.Point(3, 16);
+            this.comboBox6.Location = new System.Drawing.Point(3, 17);
             this.comboBox6.Name = "comboBox6";
             this.comboBox6.Size = new System.Drawing.Size(200, 21);
             this.comboBox6.TabIndex = 2;
@@ -706,14 +703,14 @@
             this.groupBox7.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox7.Location = new System.Drawing.Point(0, 0);
             this.groupBox7.Name = "groupBox7";
-            this.groupBox7.Size = new System.Drawing.Size(493, 40);
+            this.groupBox7.Size = new System.Drawing.Size(493, 41);
             this.groupBox7.TabIndex = 0;
             this.groupBox7.TabStop = false;
             // 
             // comboBox7
             // 
             this.comboBox7.FormattingEnabled = true;
-            this.comboBox7.Location = new System.Drawing.Point(3, 16);
+            this.comboBox7.Location = new System.Drawing.Point(3, 17);
             this.comboBox7.Name = "comboBox7";
             this.comboBox7.Size = new System.Drawing.Size(200, 21);
             this.comboBox7.TabIndex = 2;
@@ -734,7 +731,7 @@
             this.itemsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.itemsGroupBox.Location = new System.Drawing.Point(0, 0);
             this.itemsGroupBox.Name = "itemsGroupBox";
-            this.itemsGroupBox.Size = new System.Drawing.Size(619, 323);
+            this.itemsGroupBox.Size = new System.Drawing.Size(619, 285);
             this.itemsGroupBox.TabIndex = 0;
             this.itemsGroupBox.TabStop = false;
             this.itemsGroupBox.Text = "Items";
@@ -745,7 +742,7 @@
             this.tabControl.Location = new System.Drawing.Point(0, 0);
             this.tabControl.Name = "tabControl";
             this.tabControl.SelectedIndex = 0;
-            this.tabControl.Size = new System.Drawing.Size(1246, 384);
+            this.tabControl.Size = new System.Drawing.Size(1246, 422);
             this.tabControl.TabIndex = 1;
             this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
             // 

ProductionTracing/ProductionTracingWnd.cs

@@ -53,6 +53,15 @@ namespace ProductionTracing
             checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6, checkBox7, checkBox8, checkBox9 };
             comboBoxes = new ComboBox[] { comboBox1, comboBox2,      null, comboBox4, comboBox5, comboBox6, comboBox7, comboBox8, comboBox9 };
 
+            LocalSettings.PrepareCombo(comboBox1, Program.LocalSettings.Combo1History);
+            LocalSettings.PrepareCombo(comboBox2, Program.LocalSettings.Combo2History);
+            LocalSettings.PrepareCombo(comboBox4, Program.LocalSettings.Combo4History);
+            LocalSettings.PrepareCombo(comboBox5, Program.LocalSettings.Combo5History);
+            LocalSettings.PrepareCombo(comboBox6, Program.LocalSettings.Combo6History);
+            LocalSettings.PrepareCombo(comboBox7, Program.LocalSettings.Combo7History);
+            LocalSettings.PrepareCombo(comboBox8, Program.LocalSettings.Combo8History);
+            LocalSettings.PrepareCombo(comboBox9, Program.LocalSettings.Combo9History);
+
             for (int i = 0; i < Math.Min(groupBoxes.Length, checkBoxes.Length); i++)
             {
                 ManageCheckGroupBox(checkBoxes[i],groupBoxes[i]);
@@ -104,7 +113,7 @@ namespace ProductionTracing
         /// </summary>
         private void settingsBtn_Click(object sender, EventArgs e)
         {
-            if (new Forms.DatabaseSettingsDlg(Program.LocalSettings).ShowDialog() == DialogResult.OK)
+            if (new Forms.SettingsDlg(Program.LocalSettings).ShowDialog() == DialogResult.OK)
             {
                 /// TODO (connection string might have changed)
             }
@@ -162,15 +171,32 @@ namespace ProductionTracing
             }
         }
 
+        void UpdateAndSaveHistory()
+        {
+            LocalSettings ls = Program.LocalSettings;
+
+            if (checkBox1.Checked) ls.UpdateHistory(comboBox1.Text, ref ls.Combo1History);
+            if (checkBox2.Checked) ls.UpdateHistory(comboBox2.Text, ref ls.Combo2History);
+            if (checkBox4.Checked) ls.UpdateHistory(comboBox4.Text, ref ls.Combo4History);
+            if (checkBox5.Checked) ls.UpdateHistory(comboBox5.Text, ref ls.Combo5History);
+            if (checkBox6.Checked) ls.UpdateHistory(comboBox6.Text, ref ls.Combo6History);
+            if (checkBox7.Checked) ls.UpdateHistory(comboBox7.Text, ref ls.Combo7History);
+            if (checkBox8.Checked) ls.UpdateHistory(comboBox8.Text, ref ls.Combo8History);
+            if (checkBox9.Checked) ls.UpdateHistory(comboBox9.Text, ref ls.Combo9History);
+
+            ls.Save();
+        }
 
         private void executeQueryBtn_Click(object sender, EventArgs e)
         {
+            UpdateAndSaveHistory();
+            
             Thread thread = new Thread(() => Application.Run(new Common.Forms.ModelessForm(Strings.searching)));
             thread.CurrentCulture = CultureInfo.CurrentCulture;
             thread.CurrentUICulture = CultureInfo.CurrentUICulture;
             thread.Start();
 
-            string currentConnStr = Program.LocalSettings.GetConnectionString();
+            string currentConnStr = Program.LocalSettings.ConnectionString;
             string[] elems = currentConnStr.Split(new char[] { '=', ';' });
             string description = string.Format("{1}/{2}", tabControl.TabPages.Count + 1, (elems.Length > 1 ? elems[1] : "-"), (elems.Length > 3 ? elems[3] : "-"));
 
@@ -419,23 +445,26 @@ namespace ProductionTracing
 
         private void ProductionTracingWnd_FormClosing(object sender, FormClosingEventArgs e)
         {
-            Program.LocalSettings.MainWndMaximized = (WindowState == FormWindowState.Maximized);
+            LocalSettings ls = Program.LocalSettings;
+
+            ls.MainWndMaximized = (WindowState == FormWindowState.Maximized);
             if (WindowState == FormWindowState.Normal)
             {
-                Program.LocalSettings.MainWndLeft = Location.X;
-                Program.LocalSettings.MainWndTop = Location.Y;
-                Program.LocalSettings.MainWndWidth = Size.Width;
-                Program.LocalSettings.MainWndHeight = Size.Height;
+                ls.MainWndLeft = Location.X;
+                ls.MainWndTop = Location.Y;
+                ls.MainWndWidth = Size.Width;
+                ls.MainWndHeight = Size.Height;
             }
             else
             {
                 /// Maximized or minimized (when restarted, minimized window is restored as normal)
-                Program.LocalSettings.MainWndLeft = RestoreBounds.Left;
-                Program.LocalSettings.MainWndTop = RestoreBounds.Top;
-                Program.LocalSettings.MainWndWidth = RestoreBounds.Width;
-                Program.LocalSettings.MainWndHeight = RestoreBounds.Height;
+                ls.MainWndLeft = RestoreBounds.Left;
+                ls.MainWndTop = RestoreBounds.Top;
+                ls.MainWndWidth = RestoreBounds.Width;
+                ls.MainWndHeight = RestoreBounds.Height;
             }
-            Program.LocalSettings.Save();
+
+            ls.Save();
         }
 
 
@@ -456,7 +485,7 @@ namespace ProductionTracing
                 int refRecordID = (int)resultsListView.Items[ix].Tag;
                 if (refRecordID == 0) return;
 
-                using (ISession session = TracingDB.CreateSession(Program.LocalSettings.GetConnectionString()))
+                using (ISession session = TracingDB.CreateSession(Program.LocalSettings.ConnectionString))
                 {
                     new Forms.MoreInfoDlg(refRecordID, session).ShowDialog();
                     session.Close();

ProductionTracing/Program.cs

@@ -151,7 +151,6 @@ namespace ProductionTracing
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
-#if false
             ///
             /// User login
             ///
@@ -159,7 +158,7 @@ namespace ProductionTracing
             {
                 try
                 {
-                    Common.GlobalData.RemoteUsersDB = new DBSettings(Common.DBType.MySql, LocalSettings.UsersDBConnString);
+                    Common.CurrentUser.RemoteUsersDB = new DBSettings(Common.DBType.MySql, LocalSettings.UsersDBConnString);
 
                     DialogResult dr = new SharedDatabase.Forms.LoginDlg().ShowDialog();
                     if (dr != DialogResult.OK) return;
@@ -169,7 +168,6 @@ namespace ProductionTracing
                     log.ErrorFormat("Failed to connect to the database of users: {0}", exc.Message);
                 }
             }
-#endif
 
             ISession session;
             IList<OrderInfo> listOfOrders = null;
@@ -196,7 +194,7 @@ namespace ProductionTracing
 
                     MessageBox.Show(string.Format("Failed to connect to production tracing database:{0}{1}", Environment.NewLine, exc.Message));
 
-                    if (new Forms.DatabaseSettingsDlg(LocalSettings).ShowDialog() == DialogResult.OK)
+                    if (new Forms.SettingsDlg(LocalSettings).ShowDialog() == DialogResult.OK)
                     {
                         LocalSettings.Save();
                     }

ProductionTracing/Properties/AssemblyInfo.cs

@@ -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("3.0.1")]
-[assembly: AssemblyFileVersion("3.0.1")]
+[assembly: AssemblyVersion("3.0.2")]
+[assembly: AssemblyFileVersion("3.0.2")]

ProductionTracing/Resources/Strings.resx

@@ -153,9 +153,6 @@
   <data name="AddBtnText" xml:space="preserve">
     <value>Add</value>
   </data>
-  <data name="CancelBtnText" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
   <data name="CloseBtnText" xml:space="preserve">
     <value>Close</value>
   </data>
@@ -624,4 +621,19 @@
   <data name="Program_0_is_running_already" xml:space="preserve">
     <value>Program '{0}' is running already.</value>
   </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="Connection_string_tracing_DB" xml:space="preserve">
+    <value>Connection string for production tracing database</value>
+  </data>
+  <data name="Connection_string_users_DB" xml:space="preserve">
+    <value>Connection string for database of users</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="User_login_is_required" xml:space="preserve">
+    <value>User login is required</value>
+  </data>
 </root>

ProductionTracing/Resources/Strings.sk.resx

@@ -168,9 +168,6 @@
   <data name="Barcode" xml:space="preserve">
     <value>Čiarový kód</value>
   </data>
-  <data name="CancelBtnText" xml:space="preserve">
-    <value>Zrušiť</value>
-  </data>
   <data name="Clear_filters" xml:space="preserve">
     <value>Vymazať filtre</value>
   </data>
@@ -366,4 +363,19 @@
   <data name="Program_0_is_running_already" xml:space="preserve">
     <value>Program '[0}' už beží.</value>
   </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Zrušiť</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Uložiť</value>
+  </data>
+  <data name="User_login_is_required" xml:space="preserve">
+    <value>Vyžaduje sa prihlásenie používateľa</value>
+  </data>
+  <data name="Connection_string_tracing_DB" xml:space="preserve">
+    <value>Konfigurácia databázy sledovania výroby</value>
+  </data>
+  <data name="Connection_string_users_DB" xml:space="preserve">
+    <value>Konfigurácia databázy používateľov</value>
+  </data>
 </root>

ProductionTracing/Resources/Strings1.Designer.cs

@@ -189,9 +189,9 @@ namespace ProductionTracing.Resources {
         /// <summary>
         ///   Looks up a localized string similar to Cancel.
         /// </summary>
-        internal static string CancelBtnText {
+        internal static string Cancel {
             get {
-                return ResourceManager.GetString("CancelBtnText", resourceCulture);
+                return ResourceManager.GetString("Cancel", resourceCulture);
             }
         }
         
@@ -321,6 +321,24 @@ namespace ProductionTracing.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Connection string for production tracing database.
+        /// </summary>
+        internal static string Connection_string_tracing_DB {
+            get {
+                return ResourceManager.GetString("Connection_string_tracing_DB", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connection string for database of users.
+        /// </summary>
+        internal static string Connection_string_users_DB {
+            get {
+                return ResourceManager.GetString("Connection_string_users_DB", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Copy.
         /// </summary>
@@ -1311,6 +1329,15 @@ namespace ProductionTracing.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Save.
+        /// </summary>
+        internal static string Save {
+            get {
+                return ResourceManager.GetString("Save", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Save configuration.
         /// </summary>
@@ -1500,6 +1527,15 @@ namespace ProductionTracing.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to User login is required.
+        /// </summary>
+        internal static string User_login_is_required {
+            get {
+                return ResourceManager.GetString("User_login_is_required", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to User name.
         /// </summary>

Results/Entities/Batch.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -38,7 +38,8 @@ namespace Results.Entities
         public virtual int Counter9 { get; set; }
         public virtual int Counter10 { get; set; }
         public virtual DateTime StartTime { get; set; }
-		public virtual DateTime EndTime { get; set; }
+        public virtual DateTime EndTime { get; set; }
+        public virtual DateTime SaveTime { get; set; }
         public virtual bool Dirty { get; set; }
         public virtual bool RsltsSent { get; set; }
 		public virtual bool RsltsPrinted { get; set; }
@@ -156,6 +157,7 @@ namespace Results.Entities
             Counter10            = oriBatch.Counter10;
             StartTime            = oriBatch.StartTime;
             EndTime              = oriBatch.EndTime;
+            SaveTime             = oriBatch.SaveTime;
             Dirty                = oriBatch.Dirty;
             RsltsSent            = oriBatch.RsltsSent;
             RsltsPrinted         = oriBatch.RsltsPrinted;
@@ -322,7 +324,8 @@ namespace Results.Entities
 
 		public override string ToString()
 		{
-			return string.Format("Batch #{0}, Start:{1}, End:{2}, Procedure:{3}", BatchNr, StartTime, EndTime, ProcedureName);
+            return string.Format("Batch {0} ({1}s) Start {2}, End {3}, Proc={4}",
+                 BatchNr, (EndTime - StartTime).TotalSeconds, StartTime, EndTime, ProcedureName);
 		}
 
 		public virtual string ToString(int i)
@@ -363,6 +366,7 @@ namespace Results.Entities
             writer.Write(Counter10);
             writer.Write(StartTime.ToString());
             writer.Write(EndTime.ToString());
+            writer.Write(SaveTime.ToString());
             writer.Write(Dirty);
             writer.Write(RsltsSent);
             writer.Write(RsltsPrinted);
@@ -429,6 +433,7 @@ namespace Results.Entities
             Counter10 = reader.ReadInt32();
             StartTime = DateTime.Parse(reader.ReadString());
             EndTime = DateTime.Parse(reader.ReadString());
+            SaveTime = DateTime.Parse(reader.ReadString());
             Dirty = reader.ReadBoolean();
             RsltsSent = reader.ReadBoolean();
             RsltsPrinted = reader.ReadBoolean();

Results/Entities/MeterTestRslt.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -55,8 +55,7 @@ namespace Results.Entities
 		public virtual DateTime StartTime()   { return TestRslt.StartTime; }
 		public virtual DateTime EndTime()	  { return TestRslt.EndTime; }
 		public virtual double   FlowSetTime() { return TestRslt.FlowSetTime; }		/// [s]
-		public virtual double   FlowMass()    { return TestRslt.FlowMass; }			/// [kg/h]
-		public virtual double   FlowVolume()  { return TestRslt.FlowVolume; }		/// [m3/h]
+		public virtual double   Flow()        { return TestRslt.Flow; }		        /// [m3/h]
 		public virtual double   ErrorMaster() { return TestRslt.ErrorMaster; }		/// [%]
 		public virtual double   DensityLine() { return TestRslt.DensityLine; }
 		public virtual Components Components(){ return TestRslt.Components; }
@@ -76,12 +75,14 @@ namespace Results.Entities
 
 		public virtual string ProcedureName() { return WaterMeter.Batch.ProcedureName; }
 		public virtual int    BatchNr()       { return WaterMeter.Batch.BatchNr; }
-		public virtual string SerialNr()	  { return WaterMeter.SerialNr; }
+        public virtual string SerialNr()      { return (CompoundMeterId == (byte)Common.CompoundMeterId.CompoundAux)
+                                                                        ? WaterMeter.SerialNrAux
+                                                                        : WaterMeter.SerialNr; }
 		public virtual string EndState()	  { return WaterMeter.EndState; }
 		public virtual double QRise()		  { return WaterMeter.QRise; }			/// [m3/h]
 		public virtual double QFall()		  { return WaterMeter.QFall; }			/// [m3/h]
 
-		public virtual bool    Evaluate()     { return TestData().Evaluate; }
+		public virtual bool   Evaluate()      { return TestData().Evaluate; }
 		public virtual Publish Publish()      { return (Publish)TestData().Publish; }
 
         public virtual WaterMeterData WaterMeterData()   { return WaterMeter.WaterMeterData; }
@@ -99,6 +100,13 @@ namespace Results.Entities
         public virtual bool IsDataStream() { return (RegReaderType == (int)RegisterReaderType.DataStream); }
         public virtual bool IsManual()     { return (RegReaderType == (int)RegisterReaderType.Manual); }
 
+        public virtual string PassedOrErrorFlagsStr()
+        {
+            string eFlags = Utils.ErrorFlagsStr(ErrorIndicators);
+            var str = string.IsNullOrEmpty(eFlags) ? PassedColorStr(null) : eFlags;
+            return str;
+        }
+
         public virtual string PassedColorStr(string yesNoFormatOrEmpty)
         {
             if (string.IsNullOrEmpty(yesNoFormatOrEmpty))

Results/Entities/TestData.cs

@@ -26,10 +26,10 @@ namespace Results.Entities
         public virtual double ErrLimLo              { get; set; }	/// [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual double ErrLimHi              { get; set; }	/// [%] usually > 0, in case of heat meters: -Qn in m3/h
         public virtual double ErrLimMargin          { get; set; }	///	[%] makes error limits tighter: 0 <= ErrLimMargin <= abs(ErrLimXx)
-		public virtual bool   DoControlWaterTemp	{ get; set; }
 		public virtual float  TempLimLo				{ get; set; }
 		public virtual float  TempLimHi				{ get; set; }
-		public virtual sbyte  Publish				{ get; set; }   /// 0=no, 1=in all protocols, 2=on screen, 3=internal
+        public virtual string TempControl           { get; set; }
+        public virtual sbyte  Publish               { get; set; }   /// 0=no, 1=in all protocols, 2=on screen, 3=internal
 		public virtual bool   Evaluate				{ get; set; }
 
 
@@ -45,22 +45,22 @@ namespace Results.Entities
 		public TestData(Test test)
 			: this()
 		{
-			Name               =         test.Name;
-			Repeats            =         test.Repeats;
-            Qtg                = (double)test.Qtg;
-            Qfrom              = (double)test.Qfrom;
-			Qto                = (double)test.Qto;
-			TargetVolume       = (double)test.Volume;
-			TargetTime         = (double)test.TestTime;
-			Method             =         test.Method;
-			ErrLimLo           = (double)test.ErrLimLo;
-			ErrLimHi           = (double)test.ErrLimHi;
-			ErrLimMargin       = (double)test.Uncertainty;
-			DoControlWaterTemp =         test.DoControlWaterTemp;
-			TempLimLo          =         test.TempLimLo;
-			TempLimHi          =         test.TempLimHi;
-			Publish            =         test.Publish;
-			Evaluate           =         test.DoEvaluate;
+			Name           = test.Name;
+			Repeats        = test.Repeats;
+            Qtg            = test.Qtg;
+            Qfrom          = test.Qfrom;
+			Qto            = test.Qto;
+			TargetVolume   = test.Volume;
+			TargetTime     = test.TestTime;
+			Method         = test.Method;
+			ErrLimLo       = test.ErrLimLo;
+			ErrLimHi       = test.ErrLimHi;
+			ErrLimMargin   = test.Uncertainty;
+			TempLimLo      = test.TempLimLo;
+			TempLimHi      = test.TempLimHi;
+            TempControl    = test.TempControl;
+            Publish        = test.Publish;
+			Evaluate       = test.DoEvaluate;
 		}
 
         /// <summary>
@@ -68,22 +68,22 @@ namespace Results.Entities
         /// </summary>
         public TestData(TestData oriTestData)
         {
-            Name			   = oriTestData.Name;
-            Repeats			   = oriTestData.Repeats;
-            Qtg                = oriTestData.Qtg;
-            Qfrom              = oriTestData.Qfrom;
-            Qto				   = oriTestData.Qto;
-            TargetVolume	   = oriTestData.TargetVolume;
-            TargetTime		   = oriTestData.TargetTime;
-            Method			   = oriTestData.Method;
-            ErrLimLo           = oriTestData.ErrLimLo;
-            ErrLimHi           = oriTestData.ErrLimHi;
-            ErrLimMargin       = oriTestData.ErrLimMargin;
-            DoControlWaterTemp = oriTestData.DoControlWaterTemp;
-            TempLimLo		   = oriTestData.TempLimLo;
-            TempLimHi		   = oriTestData.TempLimHi;
-            Publish			   = oriTestData.Publish;
-            Evaluate           = oriTestData.Evaluate;
+            Name			= oriTestData.Name;
+            Repeats			= oriTestData.Repeats;
+            Qtg             = oriTestData.Qtg;
+            Qfrom           = oriTestData.Qfrom;
+            Qto				= oriTestData.Qto;
+            TargetVolume	= oriTestData.TargetVolume;
+            TargetTime		= oriTestData.TargetTime;
+            Method			= oriTestData.Method;
+            ErrLimLo        = oriTestData.ErrLimLo;
+            ErrLimHi        = oriTestData.ErrLimHi;
+            ErrLimMargin    = oriTestData.ErrLimMargin;
+            TempLimLo		= oriTestData.TempLimLo;
+            TempLimHi		= oriTestData.TempLimHi;
+            TempControl     = oriTestData.TempControl;
+            Publish			= oriTestData.Publish;
+            Evaluate        = oriTestData.Evaluate;
         }
 
 
@@ -105,13 +105,10 @@ namespace Results.Entities
 			if (ErrLimLo != td.ErrLimLo) return false;
 			if (ErrLimHi != td.ErrLimHi) return false;
 			if (ErrLimMargin != td.ErrLimMargin) return false;
-			if (DoControlWaterTemp != td.DoControlWaterTemp) return false;
-			if (DoControlWaterTemp)
-			{
-				if (TempLimLo != td.TempLimLo) return false;
-				if (TempLimHi != td.TempLimHi) return false;
-			}
-			if (Publish != td.Publish) return false;
+			if (TempLimLo != td.TempLimLo) return false;
+			if (TempLimHi != td.TempLimHi) return false;
+            if (TempControl != td.TempControl) return false;
+            if (Publish != td.Publish) return false;
 			if (Evaluate != td.Evaluate) return false;
 
 			return true;
@@ -150,9 +147,9 @@ namespace Results.Entities
             writer.Write(ErrLimLo);
             writer.Write(ErrLimHi);
             writer.Write(ErrLimMargin);
-            writer.Write(DoControlWaterTemp);
             writer.Write(TempLimLo);
             writer.Write(TempLimHi);
+            writer.Write((TempControl != null) ? TempControl : string.Empty);
             writer.Write(Publish);
             writer.Write(Evaluate);
         }
@@ -171,9 +168,9 @@ namespace Results.Entities
             ErrLimLo = reader.ReadDouble();
             ErrLimHi = reader.ReadDouble();
             ErrLimMargin = reader.ReadDouble();
-            DoControlWaterTemp = reader.ReadBoolean();
             TempLimLo = reader.ReadSingle();
             TempLimHi = reader.ReadSingle();
+            TempControl = reader.ReadString();
             Publish = reader.ReadSByte();
             Evaluate = reader.ReadBoolean();
         }

Results/Entities/TestRslt.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -44,8 +44,8 @@ namespace Results.Entities
 		public virtual double   DensityLine         { get; set; }	/// [kg/m3]
 		public virtual double   DensityDiv          { get; set; }	/// [kg/m3]
 		public virtual double   MassOfEvapWater     { get; set; }   /// [kg]
-		public virtual double   FlowMass            { get; set; }   /// [kg/h] calculated from conventional true value
-		public virtual double   FlowVolume          { get; set; }	/// [m3/h]
+		public virtual double   SpareDbl            { get; set; }
+		public virtual double   Flow                { get; set; }	/// [m3/h] calculated from conventional true value
 		public virtual double   VolumeCTV           { get; set; }   /// [l]    Volume conventional true value
 		public virtual double   VolumeMaster        { get; set; }   /// [l]    Volume from the master flow meter
 		public virtual double   ErrorMaster         { get; set; }	/// [%]    Error of the master flow meter
@@ -147,7 +147,8 @@ namespace Results.Entities
         public virtual int      Counter5            { get; set; }
 
 		/// Wrappers
-		public virtual string Name()		 { return Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
+		public virtual string Name()		 { return Common.Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
+        public virtual string Key()          { return string.Format("{0}~{1}~{2}~{3}", TestData.Name, Part, TestData.Repeats, RepetitionNr); }      /// Unique key
         public virtual int Repeats()         { return TestData.Repeats; }
 		public virtual double Qfrom()		 { return TestData.Qfrom; }
 		public virtual double Qto()			 { return TestData.Qto; }
@@ -158,11 +159,11 @@ namespace Results.Entities
         public virtual string Scale()        { return (Components != null && Components.Scale     != null) ? Components.Scale     : string.Empty; }
         public virtual string Diverter()     { return (Components != null && Components.Diverter  != null) ? Components.Diverter  : string.Empty; }
         public virtual string RegValve()     { return (Components != null && Components.RegValve  != null) ? Components.RegValve  : string.Empty; }
-        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
+        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("StandingStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
         public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest") || TestData.Method.ToLower().Contains("pmax")) : true; }
-        public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; }
+        public virtual bool IsStartStop() { return (MethodClass != null) ? MethodClass.Contains("StandingStart") : true; }
         public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) || MethodClass.Contains("DiverterTest")) : true; }
-        public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
+        public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.StandingStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
 
         public virtual string MethodElde()
         {
@@ -171,9 +172,9 @@ namespace Results.Entities
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionProlonged.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionComparative.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStart.")) return "VS";
-            else if (MethodClass.Contains("TestMethods.FixedStartMassCollection.")) return "MP";
-            else if (MethodClass.Contains("TestMethods.FixedStartTankCollection.")) return "VP";
-            else if (MethodClass.Contains("TestMethods.FixedStart.")) return "VP";
+            else if (MethodClass.Contains("TestMethods.StandingStartMassCollection.")) return "MP";
+            else if (MethodClass.Contains("TestMethods.StandingStartTankCollection.")) return "VP";
+            else if (MethodClass.Contains("TestMethods.StandingStart.")) return "VP";
             else return string.Empty;
         }
 
@@ -229,7 +230,7 @@ namespace Results.Entities
         public virtual float TempLimLo()        { return TestData.TempLimLo; }
         public virtual float TempLimHi()        { return TestData.TempLimHi; }
         public virtual bool Evaluate()          { return TestData.Evaluate; }
-		public virtual Common.Publish Publish() { return (Publish)TestData.Publish; }
+		public virtual Publish Publish()        { return (Publish)TestData.Publish; }
 
 
 		public TestRslt()
@@ -277,8 +278,8 @@ namespace Results.Entities
 		    DensityLine         = src.DensityLine;
 		    DensityDiv          = src.DensityDiv;
 		    MassOfEvapWater     = src.MassOfEvapWater;
-		    FlowMass            = src.FlowMass;
-		    FlowVolume          = src.FlowVolume;
+		    SpareDbl            = src.SpareDbl;
+		    Flow                = src.Flow;
 		    VolumeCTV           = src.VolumeCTV;
 		    VolumeMaster        = src.VolumeMaster;
 		    ErrorMaster         = src.ErrorMaster;
@@ -415,7 +416,7 @@ namespace Results.Entities
             return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} MassOfEvapWaater={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} InfoFlags={24} AmbTempMean={25} AmbTempStart={26} AmbTempEnd={27} AmbTempMin={28} AmbTempMax={29} AmbPressMean={30} AmbPressStart={31} AmbPressEnd={32} AmbPressMin={33}  AmbPressMax={34} AmbHumiMean={35} AmbHumiStart={36} AmbHumiEnd={37} AmbHumiMin={38} AmbHumiMax={39} PressUpMean={40} PressUpStart={41} PressUpEnd={42} PressUpMin={43} PressUpMax={44} PressDownMean={45} PressDownStart={46} PressDownEnd={47} PressDownMin={48} PressDownMax={49} PressDeltaMean={50} PressDeltaStart={51} PressDeltaEnd={52} PressDeltaMin={53} PressDeltaMax={54} TempUpMean={55} TempUpStart={56} TempUpEnd={57} TempUpMin={58} TempUpMax={59} TempDownMean={60} TempDownStart={61} TempDownEnd={62} TempDownMin={63} TempDownMax={64} TempDivMean={65} TempDivStart={66} TempDivEnd={67} TempDivMin={68} TempDivMax={69} FlowMean={70} FlowStart={71} FlowEnd={72} FlowMin={73} FlowMax={74} Custom1={75} Custom2={76} Custom3={77} Custom4={78} Custom5={79} Custom6={80} Custom7={81} Custom8={82} Custom9={83} Custom10={84}", 
 								Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
 								PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
-								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, FlowMass, FlowVolume,
+								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, SpareDbl, Flow,
 								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, InfoFlags, 
 								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
 								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
@@ -484,8 +485,8 @@ namespace Results.Entities
             writer.Write(DensityLine);
             writer.Write(DensityDiv);
             writer.Write(MassOfEvapWater);
-            writer.Write(FlowMass);
-            writer.Write(FlowVolume);
+            writer.Write(SpareDbl);
+            writer.Write(Flow);
             writer.Write(VolumeCTV);
             writer.Write(VolumeMaster);
             writer.Write(ErrorMaster);
@@ -625,8 +626,8 @@ namespace Results.Entities
             DensityLine = reader.ReadDouble();
             DensityDiv = reader.ReadDouble();
             MassOfEvapWater = reader.ReadDouble();
-            FlowMass = reader.ReadDouble();
-            FlowVolume = reader.ReadDouble();
+            SpareDbl = reader.ReadDouble();
+            Flow = reader.ReadDouble();
             VolumeCTV = reader.ReadDouble();
             VolumeMaster = reader.ReadDouble();
             ErrorMaster = reader.ReadDouble();

Results/Entities/WaterMeter.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace Results.Entities
         public virtual string CompleteSerialNr  { get; set; }
         public virtual string OriRadioAddress   { get; set; }   /// Not mapped to DB !!!    Original radio address of a 640 water meter (albatrosID)
         public virtual int    WMTypeRevision    { get; set; }
-        public virtual int    Pruefindex        { get; set; }	/// >= 1 ... pruefindex
+        public virtual int    Pruefindex        { get; set; }	/// >=1 ... pruefindex, 0 ... unknown (no reading from DB yet)
 		public virtual int	  HydrPruefung		{ get; set; }
         public virtual object RawTestInfos      { get; set; }	/// IList<SensusTestInfo> fetched from Oracle at the beginning of the cycle, not mapped to DB !!!
         public virtual object CompleteTestInfos { get; set; }	/// SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!!
@@ -117,15 +117,23 @@ namespace Results.Entities
 		///
 		/// Wrappers
 		///
-		public virtual string ProductName()		  { return WaterMeterData.ProductName; }
+        public virtual string GetEndStateAux() { return Compound() ? EndStateAux : string.Empty; }
+        public virtual void   SetEndStateAux(string s) { if (Compound()) EndStateAux = s; }
+
+        public virtual string GetStartState() { return Compound() ? string.Empty : EndStateAux; }
+        public virtual void   SetStartState(string s) { if (!Compound()) EndStateAux = s; }
+
+        public virtual string ProductName()       { return WaterMeterData.ProductName; }
 		public virtual string Producer()		  { return WaterMeterData.Producer; }
 		public virtual string MetrologicalClass() { return WaterMeterData.MetrologicalClass; }
 		public virtual string ApprovalInfo()	  { return WaterMeterData.ApprovalInfo; }
-		public virtual bool   NewQnames()         { return WaterMeterData.NewQnames; }
+		public virtual FlowNames Qnames()         { return (FlowNames)WaterMeterData.Qnames; }
 		public virtual double Q4_Qmax()			  { return WaterMeterData.Q4_Qmax; }
 		public virtual double Q3_Qn()			  { return WaterMeterData.Q3_Qn; }
 		public virtual double Q2_Qt()			  { return WaterMeterData.Q2_Qt; }
 		public virtual double Q1_Qmin()			  { return WaterMeterData.Q1_Qmin; }
+        public virtual double ErrLimHiQ()         { return WaterMeterData.ErrLimHiQ; }
+        public virtual double ErrLimLoQ()         { return WaterMeterData.ErrLimLoQ; }
 
         public virtual bool   Compound()		  { return WaterMeterData.Compound; }
         public virtual bool   HeatMeter()		  { return WaterMeterData.HeatMeter; }
@@ -430,25 +438,29 @@ namespace Results.Entities
             Suffix = string.Empty;
             CompleteSerialNr = string.Empty;
             WMTypeRevision = 0;
-            Pruefindex = 1;
+            Pruefindex = 0;
             HydrPruefung = 0;
             RawTestInfos = null;
             CompleteTestInfos = null;
 
             Workflow = string.Empty;
             ErrorFlags = 0;
+            InfoFlags = 0;
             LastRecordIsNok = false;
 
             /// Initialize strings
             SerialNr = string.Empty;
             SerialNrAux = string.Empty;
+            RadioAddress = string.Empty;
             PurchaseOrder = string.Empty;
             EndState = string.Empty;
             EndStateAux = string.Empty;
             ArchivePath = string.Empty;
             Remark = string.Empty;
+#if IPERL
+            FWVersion = string.Empty;
+#endif
 #if TURA_SPECIAL
-            RadioAddress = string.Empty;
             ProdUserName = string.Empty;
             ProdPurchaseOrder = string.Empty;
 #endif
@@ -464,6 +476,7 @@ namespace Results.Entities
             
             SerialNr           = src.SerialNr;
 		    SerialNrAux        = src.SerialNrAux;
+            RadioAddress       = src.RadioAddress;
 		    PurchaseOrder      = src.PurchaseOrder;
 		    YearOfProduction   = src.YearOfProduction;
             WMPosition         = src.WMPosition;
@@ -492,22 +505,22 @@ namespace Results.Entities
 			FWVersion          = src.FWVersion;
 #endif
 #if TURA_SPECIAL
-            RadioAddress = src.RadioAddress;
-            PaletteNr = src.PaletteNr;
-            UmkartonNr = src.UmkartonNr;
-            ProdTestBench = src.ProdTestBench;
-            ProdWMPosition = src.ProdWMPosition;
-            ProdUserName = src.ProdUserName;
-            ProdPurchaseOrder = src.ProdPurchaseOrder;
-            ProdPassed = src.ProdPassed;
-            ProdResultCode = src.ProdResultCode;
-            ProdQ2CorrRL = src.ProdQ2CorrRL;
-            ProdQ2CorrLR = src.ProdQ2CorrLR;
+            PaletteNr          = src.PaletteNr;
+            UmkartonNr         = src.UmkartonNr;
+            ProdTestBench      = src.ProdTestBench;
+            ProdWMPosition     = src.ProdWMPosition;
+            ProdUserName       = src.ProdUserName;
+            ProdPurchaseOrder  = src.ProdPurchaseOrder;
+            ProdPassed         = src.ProdPassed;
+            ProdResultCode     = src.ProdResultCode;
+            ProdQ2CorrRL       = src.ProdQ2CorrRL;
+            ProdQ2CorrLR       = src.ProdQ2CorrLR;
 #endif
             AssignedSerialNr   = src.AssignedSerialNr;
             Prefix             = src.Prefix;
             Suffix             = src.Suffix;
             CompleteSerialNr   = src.CompleteSerialNr;
+            OriRadioAddress    = src.OriRadioAddress;
             WMTypeRevision     = src.WMTypeRevision;
             Pruefindex         = src.Pruefindex;
 		    HydrPruefung       = src.HydrPruefung;
@@ -643,6 +656,7 @@ namespace Results.Entities
             writer.Write(Id);
             writer.Write((SerialNr != null) ? SerialNr : string.Empty);
             writer.Write((SerialNrAux != null) ? SerialNrAux : string.Empty);
+            writer.Write((RadioAddress != null) ? RadioAddress : string.Empty);
             writer.Write((PurchaseOrder != null) ? PurchaseOrder : string.Empty);
             writer.Write(YearOfProduction);
             writer.Write(WMPosition);
@@ -671,7 +685,6 @@ namespace Results.Entities
             writer.Write((FWVersion != null) ? FWVersion : string.Empty);
 #endif
 #if TURA_SPECIAL
-            writer.Write((RadioAddress != null) ? RadioAddress : string.Empty);
             writer.Write(PaletteNr);
             writer.Write(UmkartonNr);
             writer.Write((ProdTestBench != null) ? ProdTestBench : string.Empty);
@@ -687,6 +700,7 @@ namespace Results.Entities
             writer.Write((Prefix != null) ? Prefix : string.Empty);
             writer.Write((Suffix != null) ? Suffix : string.Empty);
             writer.Write((CompleteSerialNr != null) ? CompleteSerialNr : string.Empty);
+            writer.Write((OriRadioAddress != null) ? OriRadioAddress : string.Empty);
             writer.Write(WMTypeRevision);
             writer.Write(Pruefindex);
             writer.Write(HydrPruefung);
@@ -736,6 +750,7 @@ namespace Results.Entities
             Id = reader.ReadInt32();
             SerialNr = reader.ReadString();
             SerialNrAux = reader.ReadString();
+            RadioAddress = reader.ReadString();
             PurchaseOrder = reader.ReadString();
             YearOfProduction = reader.ReadInt32();
             WMPosition = reader.ReadInt32();
@@ -764,7 +779,6 @@ namespace Results.Entities
             FWVersion = reader.ReadString();
 #endif
 #if TURA_SPECIAL
-            RadioAddress = reader.ReadString();
             PaletteNr = reader.ReadInt32();
             UmkartonNr = reader.ReadInt32();
             ProdTestBench = reader.ReadString();
@@ -780,6 +794,7 @@ namespace Results.Entities
             Prefix = reader.ReadString();
             Suffix = reader.ReadString();
             CompleteSerialNr = reader.ReadString();
+            OriRadioAddress = reader.ReadString();
             WMTypeRevision = reader.ReadInt32();
             Pruefindex = reader.ReadInt32();
             HydrPruefung = reader.ReadInt32();

Results/Entities/WaterMeterData.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -17,11 +17,14 @@ namespace Results.Entities
         public virtual double                      DN                          { get; set; }	/// [mm]
         public virtual double                      L                           { get; set; }	/// [mm]
         public virtual Mounting                    Mounting                    { get; set; }	/// H / V / S / F
-		public virtual bool                        NewQnames                   { get; set; }	/// Yes = Q3...  No = Qn...
+		public virtual sbyte                       Qnames                      { get; set; }	/// see Common.Enums.FlowNames
         public virtual double                      Q4_Qmax                     { get; set; }	/// [m3/h]
 		public virtual double                      Q3_Qn                       { get; set; }	/// [m3/h]
 		public virtual double                      Q2_Qt                       { get; set; }	/// [m3/h]
 		public virtual double                      Q1_Qmin                     { get; set; }	/// [m3/h]
+        public virtual double                      ErrLimHiQ                   { get; set; }	/// [%]
+        public virtual double                      ErrLimLoQ                   { get; set; }	/// [%]
+        
         public virtual string                      MetrologicalClass           { get; set; }
         public virtual TemperatureClass            TemperatureClass            { get; set; }
         public virtual PressureLossClass           PressureLossClass           { get; set; }
@@ -64,11 +67,13 @@ namespace Results.Entities
             DN                          = oriWMData.DN;
             L                           = oriWMData.L;
             Mounting                    = oriWMData.Mounting;
-            NewQnames                   = oriWMData.NewQnames;
+            Qnames                      = oriWMData.Qnames;
             Q4_Qmax                     = oriWMData.Q4_Qmax;
             Q3_Qn                       = oriWMData.Q3_Qn;
             Q2_Qt                       = oriWMData.Q2_Qt;
             Q1_Qmin                     = oriWMData.Q1_Qmin;
+            ErrLimHiQ                   = oriWMData.ErrLimHiQ;
+            ErrLimLoQ                   = oriWMData.ErrLimLoQ;
             MetrologicalClass           = oriWMData.MetrologicalClass;
             TemperatureClass            = oriWMData.TemperatureClass;
             PressureLossClass           = oriWMData.PressureLossClass;
@@ -105,11 +110,13 @@ namespace Results.Entities
             if (DN != wmd.DN) return false;
             if (L != wmd.L) return false;
             if (Mounting != wmd.Mounting) return false;
-			if (NewQnames != wmd.NewQnames) return false;
+			if (Qnames != wmd.Qnames) return false;
             if (Q4_Qmax != wmd.Q4_Qmax) return false;
 			if (Q3_Qn   != wmd.Q3_Qn) return false;
 			if (Q2_Qt   != wmd.Q2_Qt) return false;
 			if (Q1_Qmin != wmd.Q1_Qmin) return false;
+            if (ErrLimHiQ != wmd.ErrLimHiQ) return false;
+            if (ErrLimLoQ != wmd.ErrLimLoQ) return false;
             if (MetrologicalClass != wmd.MetrologicalClass) return false;
             if (TemperatureClass != wmd.TemperatureClass) return false;
             if (PressureLossClass != wmd.PressureLossClass) return false;
@@ -161,11 +168,13 @@ namespace Results.Entities
             writer.Write(DN);
             writer.Write(L);
             writer.Write((int)Mounting);
-            writer.Write(NewQnames);
+            writer.Write((int)Qnames);
             writer.Write(Q4_Qmax);
             writer.Write(Q3_Qn);
             writer.Write(Q2_Qt);
             writer.Write(Q1_Qmin);
+            writer.Write(ErrLimHiQ);
+            writer.Write(ErrLimLoQ);
             writer.Write((MetrologicalClass != null) ? MetrologicalClass : string.Empty);
             writer.Write((int)TemperatureClass);
             writer.Write((int)PressureLossClass);
@@ -197,11 +206,13 @@ namespace Results.Entities
             DN = reader.ReadDouble();
             L = reader.ReadDouble();
             Mounting = (Mounting)reader.ReadInt32();
-            NewQnames = reader.ReadBoolean();
+            Qnames = (sbyte)reader.ReadInt32();
             Q4_Qmax = reader.ReadDouble();
             Q3_Qn = reader.ReadDouble();
             Q2_Qt = reader.ReadDouble();
             Q1_Qmin = reader.ReadDouble();
+            ErrLimHiQ = reader.ReadDouble();
+            ErrLimLoQ = reader.ReadDouble();
             MetrologicalClass = reader.ReadString();
             TemperatureClass = (TemperatureClass)reader.ReadInt32();
             PressureLossClass = (PressureLossClass)reader.ReadInt32();

Results/Forms/BatchResultsDlg.cs

@@ -29,6 +29,7 @@ namespace Results.Forms
         public int PopupResultsWidth;
         public int PopupResultsHeight;
         public int[] RsltsClmnWidths;
+        public IList<string> SerialNrs;
 
 
         ///
@@ -126,7 +127,8 @@ namespace Results.Forms
             int displayedControlsCount = 0;
             for (int i = 0; i < results.Batch.WaterMeters.Count; i++)
             {
-                if ((!results.Batch.WaterMeters[i].Disabled) || ShowDisabledPositions)
+                if ((ShowDisabledPositions || !results.Batch.WaterMeters[i].Disabled) &&
+                    (SerialNrs == null || SerialNrs.Contains(results.Batch.WaterMeters[i].SerialNr)))
                 {
                     displayedControlsCount++;
                 }
@@ -167,7 +169,8 @@ namespace Results.Forms
             firstEnabledControl = null;
             for (int i = 0; i < results.Batch.WaterMeters.Count; i++)
             {
-                if (!results.Batch.WaterMeters[i].Disabled || ShowDisabledPositions)
+                if ((ShowDisabledPositions || !results.Batch.WaterMeters[i].Disabled) &&
+                    (SerialNrs == null || SerialNrs.Contains(results.Batch.WaterMeters[i].SerialNr)))
                 {
                     /// Create one water meter position / control
                     wmRsltsCtrl[ix] = (TestsArrangement == TestsArrangement.Rows)
@@ -216,7 +219,8 @@ namespace Results.Forms
                 int ctrlIx = 0;
                 for (int wmNr0 = 0; wmNr0 < results.Batch.WaterMeters.Count; wmNr0++)
                 {
-                    if (!results.Batch.WaterMeters[wmNr0].Disabled || ShowDisabledPositions)
+                    if ((ShowDisabledPositions || !results.Batch.WaterMeters[wmNr0].Disabled) &&
+                        (SerialNrs == null || SerialNrs.Contains(results.Batch.WaterMeters[wmNr0].SerialNr)))
                     {
                         if (ctrlIx < wmRsltsCtrl.Length) wmRsltsCtrl[ctrlIx++].Update(results.Batch.WaterMeters[wmNr0]);
                     }

Results/Forms/MoreWMResultsDlg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -14,6 +14,13 @@ namespace Results.Forms
 {
     public partial class MoreWMResultsDlg : Form
     {
+        enum Tabs
+        {
+            Results = 0,
+            Graph,
+            Tracing,
+        }
+
         public MoreWMResultsDlg(Results.Entities.WaterMeter wm, IList<ReferenceRecord> refRecords)
         {
             InitializeComponent();
@@ -23,14 +30,15 @@ namespace Results.Forms
             ShowAllResults(wm);
             ShowChart(wm);
 
+            /// Select the initial tab page to be displayed
             if (refRecords == null)
             {
-                tabControl1.SelectTab(1);
-                tabControl1.TabPages.RemoveAt(2);
+                tabControl1.SelectTab((int)Tabs.Graph);
+                tabControl1.TabPages.RemoveAt((int)Tabs.Tracing);
             }
             else
             {
-                tabControl1.SelectTab(2);
+                tabControl1.SelectTab((int)Tabs.Tracing);
                 ShowTracingResults(wm, refRecords);
             }
         }
@@ -39,9 +47,9 @@ namespace Results.Forms
         void Localize()
         {
             Text = Strings.Water_meter_results;
-            tabControl1.TabPages[0].Text = Strings.All_results;
-            tabControl1.TabPages[1].Text = Strings.Graphs;
-            tabControl1.TabPages[2].Text = Strings.Production_tracing_results;
+            tabControl1.TabPages[(int)Tabs.Results].Text = Strings.All_results;
+            tabControl1.TabPages[(int)Tabs.Graph].Text = Strings.Graphs;
+            tabControl1.TabPages[(int)Tabs.Tracing].Text = Strings.Production_tracing_results;
         }
 
 
@@ -107,11 +115,7 @@ namespace Results.Forms
 
         void ShowChart(Results.Entities.WaterMeter wm)
         {
-            //chart.ChartAreas[0].AxisX.LabelStyle.Format = "dd.MM.yy";
-            //chart.ChartAreas[0].AxisX.Interval = 1;
-            //chart.ChartAreas[0].AxisX.IntervalType = ;
-
-            tabControl1.TabPages[1].Controls.Add(Results.Output.WMChart.GetChart(wm, false));
+            tabControl1.TabPages[(int)Tabs.Graph].Controls.Add(Results.Output.WMChart.GetChart(wm, false));
         }
 
 

Results/Forms/OneWMResultsColumnsCtrl.Designer.cs

@@ -41,6 +41,7 @@
             // 
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.splitContainer1.Location = new System.Drawing.Point(0, 0);
             this.splitContainer1.Name = "splitContainer1";
             this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
@@ -48,12 +49,13 @@
             // splitContainer1.Panel1
             // 
             this.splitContainer1.Panel1.Controls.Add(this.tBox);
+            this.splitContainer1.Panel1MinSize = 26;
             // 
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.lView);
             this.splitContainer1.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.SplitterDistance = 25;
+            this.splitContainer1.SplitterDistance = 26;
             this.splitContainer1.SplitterWidth = 1;
             this.splitContainer1.TabIndex = 0;
             // 
@@ -62,7 +64,7 @@
             this.tBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tBox.Location = new System.Drawing.Point(0, 0);
             this.tBox.Name = "tBox";
-            this.tBox.Size = new System.Drawing.Size(352, 20);
+            this.tBox.Size = new System.Drawing.Size(352, 26);
             this.tBox.TabIndex = 0;
             this.tBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.tBox_MouseDoubleClick);
             // 
@@ -73,17 +75,17 @@
             this.lView.GridLines = true;
             this.lView.Location = new System.Drawing.Point(0, 0);
             this.lView.Name = "lView";
-            this.lView.Size = new System.Drawing.Size(352, 292);
+            this.lView.Size = new System.Drawing.Size(352, 291);
             this.lView.TabIndex = 0;
             this.lView.UseCompatibleStateImageBehavior = false;
             this.lView.View = System.Windows.Forms.View.Details;
             // 
-            // OneWMResultsCtrl
+            // OneWMResultsColumnsCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.splitContainer1);
-            this.Name = "OneWMResultsCtrl";
+            this.Name = "OneWMResultsColumnsCtrl";
             this.Size = new System.Drawing.Size(352, 318);
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel1.PerformLayout();

Results/Forms/OneWMResultsColumnsCtrl.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Drawing;
@@ -85,7 +85,11 @@ namespace Results.Forms
 
             /// Update caption
 #if ORACLE_DB
-            tBox.Text = caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
+            tBox.Text = caption = string.Format("{0} ({1}) {2} {3}",
+                                                wMtr.WMPosition,
+                                                wMtr.Pruefindex == 0 ? "?" : string.Format("{0}x", wMtr.Pruefindex % 100),
+                                                (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr),
+                                                message);
 #else
             tBox.Text = caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
 #endif

Results/Forms/OneWMResultsRowsCtrl.Designer.cs

@@ -48,21 +48,23 @@
             // splitContainer1.Panel1
             // 
             this.splitContainer1.Panel1.Controls.Add(this.tBox);
+            this.splitContainer1.Panel1MinSize = 26;
             // 
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.lView);
             this.splitContainer1.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.SplitterDistance = 25;
+            this.splitContainer1.SplitterDistance = 26;
             this.splitContainer1.SplitterWidth = 1;
             this.splitContainer1.TabIndex = 0;
             // 
             // tBox
             // 
             this.tBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.tBox.Location = new System.Drawing.Point(0, 0);
             this.tBox.Name = "tBox";
-            this.tBox.Size = new System.Drawing.Size(352, 20);
+            this.tBox.Size = new System.Drawing.Size(352, 26);
             this.tBox.TabIndex = 0;
             this.tBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.tBox_MouseDoubleClick);
             // 
@@ -73,17 +75,17 @@
             this.lView.GridLines = true;
             this.lView.Location = new System.Drawing.Point(0, 0);
             this.lView.Name = "lView";
-            this.lView.Size = new System.Drawing.Size(352, 292);
+            this.lView.Size = new System.Drawing.Size(352, 291);
             this.lView.TabIndex = 0;
             this.lView.UseCompatibleStateImageBehavior = false;
             this.lView.View = System.Windows.Forms.View.Details;
             // 
-            // OneWMResultsCtrl
+            // OneWMResultsRowsCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.splitContainer1);
-            this.Name = "OneWMResultsCtrl";
+            this.Name = "OneWMResultsRowsCtrl";
             this.Size = new System.Drawing.Size(352, 318);
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel1.PerformLayout();

Results/Forms/OneWMResultsRowsCtrl.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Drawing;
@@ -97,7 +97,11 @@ namespace Results.Forms
 
             /// Update caption
 #if ORACLE_DB
-            tBox.Text = caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
+            tBox.Text = caption = string.Format("{0} ({1}) {2} {3}",
+                                                wMtr.WMPosition,
+                                                wMtr.Pruefindex == 0 ? "?" : string.Format("{0}x", wMtr.Pruefindex % 100),
+                                                (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr),
+                                                message);
 #else
             tBox.Text = caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
 #endif

Results/ItemID.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
 
@@ -22,7 +22,7 @@ namespace Results
         Test_start_time,                /// 12
         Test_end_time,                  /// 13
         Test_time,                      /// 14
-        Flow,                           /// 15
+        Flow,                           /// 15 Calculated flow (use ConstMasterRaw/ConstMaster to calculate uncorrected flow of the reference flow meter)
         T_up_mean,                      /// 16
         T_down_mean,                    /// 17
         T_div,                          /// 18
@@ -230,7 +230,7 @@ namespace Results
         PMax_test_time,                 /// 199  Pressure test time
         Start_valve_open_time,          /// 200
         Start_valve_close_time,         /// 201
-        Qc,                             /// 202  Flow for a water meter
+        NotUsed202,                     /// 202
         Degree__liter,                  /// 203  Water meter constant (degree per liter) specific for one test with camera
         Camera_angle,                   /// 204
         Camera_angle_start,             /// 205
@@ -245,11 +245,11 @@ namespace Results
 
         Medium,                         /// 213  Woda zimna/ciepla
 
-        Flow_ctv,                       /// 214
-        Flow_ctv_min,                   /// 215
-        Flow_ctv_max,                   /// 216
-        Flow_ctv_start,                 /// 217
-        Flow_ctv_end,                   /// 218
+        NotUsed214,                     /// 214
+        NotUsed215,                     /// 215
+        NotUsed216,                     /// 216
+        NotUsed217,                     /// 217
+        NotUsed218,                     /// 218
         ConstMasterRaw,                 /// 219  ConstMaster (like 194) uncorrected
         Reference_error_corr,           /// 220  Reference flow meter error after correction using correction curve
 

Results/Mappings/BatchMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -34,6 +34,7 @@ namespace Results.Mappings
 
 			Map(x => x.StartTime);
 			Map(x => x.EndTime);
+            Map(x => x.SaveTime);
             Map(x => x.Dirty);
             Map(x => x.RsltsSent);
 			Map(x => x.RsltsPrinted);

Results/Mappings/TestRsltMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2022 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -39,10 +39,9 @@ namespace Results.Mappings
 			Map(x => x.DensityIn);
             Map(x => x.DensityLine);
 			Map(x => x.DensityDiv);
-			Map(x => x.MassOfEvapWater)
-                .Column("Buoyancy");
-			Map(x => x.FlowMass);
-			Map(x => x.FlowVolume);
+			Map(x => x.MassOfEvapWater).Column("Buoyancy");
+			Map(x => x.SpareDbl).Column("FlowMass");
+			Map(x => x.Flow).Column("FlowVolume");
 			Map(x => x.VolumeCTV);
 			Map(x => x.VolumeMaster);
 			Map(x => x.ErrorMaster);

Results/Mappings/WaterMeterDataMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2017 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -18,13 +18,13 @@ namespace Results.Mappings
             Map(x => x.L);
             Map(x => x.Mounting);
 
-#if MUNICH && LANG_DE
-			Map(x => x.NewQnames);
-#endif
+			Map(x => x.Qnames);
             Map(x => x.Q4_Qmax);
 			Map(x => x.Q3_Qn);
 			Map(x => x.Q2_Qt);
 			Map(x => x.Q1_Qmin);
+            Map(x => x.ErrLimHiQ);
+            Map(x => x.ErrLimLoQ);
 
             Map(x => x.MetrologicalClass);
             Map(x => x.TemperatureClass);

Results/Mappings/WaterMeterMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2017 Sensus Metering Systems
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -61,9 +61,9 @@ namespace Results.Mappings
             Map(x => x.Suffix);
             Map(x => x.CompleteSerialNr);
             Map(x => x.OriRadioAddress);
+            Map(x => x.WMTypeRevision);
             Map(x => x.Pruefindex);
             Map(x => x.HydrPruefung);
-            Map(x => x.WMTypeRevision);
 #endif
             References(x => x.WaterMeterData);
 			References(x => x.Batch);

Results/Output/SensusTestInfo.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -15,6 +15,7 @@ namespace Results.Output
         Just_Q3Q2adjQ1_Alt,     /// pNrs = -1,5,2,1
         JustA0A4_Q3Q2adjQ1,     /// pNrs = -2,-1,3,2,1 (Australia 169 MHz, raw data pNrs: -2,-1,4,3,2,1)
         JustA0A4_Q3Q2Q1,        /// pNrs = -2,-1,3,2,1 (Australia 169 MHz smart, raw data pNrs: -2,-1,3,2,1)
+        JustA0_Q3Q2Q1,          /// pNrs = -1,3,2,1    (Australia 169 MHz smart, raw data pNrs: -1,3,2,1)
         DEWA,           	    /// Q4, Q3, Q2adj, Q2, Q1
         DEWA_wo_Q2,             /// Q4, Q3, Q2adj, Q1
         Suez,           	    /// Two directions, with Q2 and Q2ac
@@ -101,7 +102,8 @@ namespace Results.Output
         }
 
         /// <summary>
-        /// Determines whether test infos are compatible with procedure tests.
+        /// Determines whether test infos are compatible with procedure tests:
+        ///   For each 'cti'in candidate SensusTestInfo array there must exist a string 'cti.TestName' in testNames.
         /// </summary>
         /// <returns>true when compatible</returns>
         public static bool AreCompatible(SensusTestInfo[] completeTestInfo, IList<string> testNames)
@@ -126,7 +128,9 @@ namespace Results.Output
 
 
         /// <summary>
-        /// Determines whether Oracle and complete test infos are compatible.
+        /// Determines whether Oracle and complete test infos are compatible:
+        ///   For each 'oti' in OracleTestInfo there must exist a compatible ...
+        ///   ... cti.PruefungsNrDB + cti.QBezeichnungDB pair in candidate SensusTestInfo.
         /// </summary>
         /// <returns>true when compatible</returns>
         public static bool AreCompatible(IList<SensusTestInfo> oracleTestInfo, SensusTestInfo[] completeTestInfo)
@@ -178,7 +182,7 @@ namespace Results.Output
                 SensusTestInfo[] candidateTinfo = SensusTestInfo.GetTestInfos(lt);
 
                 if (AreCompatible(candidateTinfo, testNames) && AreCompatible(oracleTestInfo, candidateTinfo) &&
-                    ((bestMatch == null) || (candidateTinfo.Length > bestMatchLen)))
+                    ((bestMatch == null) || (candidateTinfo.Length < bestMatchLen)))
                 {
                     bestLT = lt;
                     bestMatch = candidateTinfo;
@@ -292,6 +296,16 @@ namespace Results.Output
                         new SensusTestInfo("Q2",           2,   "Q2",   2, "02",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",           1,   "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
+
+                case LogType.JustA0_Q3Q2Q1:      /// Australia 169 MHz with default Q2 corrections and conditional update at the end of cycle
+                    return new SensusTestInfo[]
+                    {
+                        ///                TBF            Oracle DB    Opto RAW   LU logfiles 
+                        new SensusTestInfo("Qjust_A0",    -1, "Just",  -1, "-1",  -1,  "Q-1", Range.R95_105),
+                        new SensusTestInfo("Q3",           3,   "Q3",   3, "03",   3,   "Q3", Range.R90_100),
+                        new SensusTestInfo("Q2",           2,   "Q2",   2, "02",   2,   "Q2", Range.R100_110),
+                        new SensusTestInfo("Q1",           1,   "Q1",   1, "01",   1,   "Q1", Range.R100_110),
+                    };
                 
                 case LogType.DEWA:                  /// DEWA (with Q4 and Q2 after correction)
                     return new SensusTestInfo[]

Results/Output/WMChart.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019-2022 Sensus Metering Systems
+/// Copyright (c) 2019-2023 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -25,7 +25,7 @@ namespace Results.Output
             IList<PointF> unsortedPoints = new List<PointF>();
             foreach (var mtr in wm.RegularMeterTestRslts())
             {
-                double flow = mtr.TestRslt.FlowVolume;
+                double flow = mtr.TestRslt.Flow;
                 var td = mtr.TestRslt.TestData;
 
                 if (mtr.IsPilotRslt() && flow > 0 && td.Evaluate &&
@@ -55,6 +55,9 @@ namespace Results.Output
             chArea.AxisX.LogarithmBase = 10;
             chArea.AxisX.IsLabelAutoFit = true;
 
+            Series upperLimit = new Series { Name = Strings.Upper_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
+            Series lowerLimit = new Series { Name = Strings.Lower_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
+
             List<double> xs = new List<double>() { 0.0001, 0.0002, 0.0005,
                                                    0.001, 0.002, 0.005,
                                                    0.01, 0.02, 0.05,
@@ -71,6 +74,8 @@ namespace Results.Output
             double from = Common.Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin);
             double to = Common.Units.ConvertTo(flowUnit, isQ4 ? wm.WaterMeterData.Q4_Qmax : wm.WaterMeterData.Q3_Qn);
             bool inRange = false;
+            double qSharp = (wm.WaterMeterData.Qnames == (sbyte)FlowNames.QpQi) ? GetQsharp(wm, flowUnit) : 0;
+            double lastXs = 0;
             for (int i = 0; i < xs.Count - 3; i += 3)
             {
                 if (xs[i] <= from && from < xs[i + 3])
@@ -88,6 +93,37 @@ namespace Results.Output
                         cl.FromPosition = Math.Log10(xs[j] * spacer);
                         cl.ToPosition = Math.Log10(xs[j] / spacer);
                         chArea.AxisX.CustomLabels.Add(cl);
+
+                        if (wm.WaterMeterData.Qnames == (sbyte)FlowNames.QpQi)
+                        {
+                            if (lastXs != 0)
+                            {
+                                double insertedXs = Math.Sqrt(lastXs * xs[j]);
+
+                                if (lastXs < qSharp && qSharp < insertedXs)
+                                {
+                                    double errLim3 = GetErrorLimit(wm, flowUnit, qSharp);
+                                    lowerLimit.Points.AddXY(qSharp, -errLim3);
+                                    upperLimit.Points.AddXY(qSharp, +errLim3);
+                                }
+
+                                double errLim2 = GetErrorLimit(wm, flowUnit, insertedXs);
+                                lowerLimit.Points.AddXY(insertedXs, -errLim2);
+                                upperLimit.Points.AddXY(insertedXs, +errLim2);
+
+                                if (insertedXs < qSharp && qSharp < xs[j])
+                                {
+                                    double errLim3 = GetErrorLimit(wm, flowUnit, qSharp);
+                                    lowerLimit.Points.AddXY(qSharp, -errLim3);
+                                    upperLimit.Points.AddXY(qSharp, +errLim3);
+                                }
+                            }
+                            lastXs = xs[j];
+
+                            double errLim = GetErrorLimit(wm, flowUnit, xs[j]);
+                            lowerLimit.Points.AddXY(xs[j], -errLim);
+                            upperLimit.Points.AddXY(xs[j], +errLim);
+                        }
                     }
                 }
 
@@ -101,6 +137,36 @@ namespace Results.Output
                     cl.ToPosition = Math.Log10(xs[i + 3] / spacer);
                     chArea.AxisX.CustomLabels.Add(cl);
 
+                    if (wm.WaterMeterData.Qnames == (sbyte)FlowNames.QpQi)
+                    {
+                        if (lastXs != 0)
+                        {
+                            double insertedXs = Math.Sqrt(lastXs * xs[i + 3]);
+
+                            if (lastXs < qSharp && qSharp < insertedXs)
+                            {
+                                double errLim3 = GetErrorLimit(wm, flowUnit, qSharp);
+                                lowerLimit.Points.AddXY(qSharp, -errLim3);
+                                upperLimit.Points.AddXY(qSharp, +errLim3);
+                            }
+
+                            double errLim2 = GetErrorLimit(wm, flowUnit, insertedXs);
+                            lowerLimit.Points.AddXY(insertedXs, -errLim2);
+                            upperLimit.Points.AddXY(insertedXs, +errLim2);
+
+                            if (insertedXs < qSharp && qSharp < xs[i + 3])
+                            {
+                                double errLim3 = GetErrorLimit(wm, flowUnit, qSharp);
+                                lowerLimit.Points.AddXY(qSharp, -errLim3);
+                                upperLimit.Points.AddXY(qSharp, +errLim3);
+                            }
+                        }
+
+                        double errLim = GetErrorLimit(wm, flowUnit, xs[i + 3]);
+                        lowerLimit.Points.AddXY(xs[i + 3], -errLim);
+                        upperLimit.Points.AddXY(xs[i + 3], +errLim);
+                    }
+
                     break;
                 }
             }
@@ -111,19 +177,20 @@ namespace Results.Output
 
             Legend legend1 = new Legend { Name = "Legend1" };
 
-            Series upperLimit = new Series { Name = Strings.Upper_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), 5);
-            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 5);
-            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), 2);
-            upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), 2);
-            if (isQ4) upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), 2);
+            if (wm.WaterMeterData.Qnames == (sbyte)FlowNames.Q3Q2Q1 || wm.WaterMeterData.Qnames == (sbyte)FlowNames.QnQtQmin)
+            {
+                upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), wm.WaterMeterData.ErrLimLoQ);
+                upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), wm.WaterMeterData.ErrLimLoQ);
+                upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), wm.WaterMeterData.ErrLimHiQ);
+                upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), wm.WaterMeterData.ErrLimHiQ);
+                if (isQ4) upperLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), wm.WaterMeterData.ErrLimHiQ);
 
-            Series lowerLimit = new Series { Name = Strings.Lower_limit, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.Red };
-            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), -5);
-            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -5);
-            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -2);
-            lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), -2);
-            if (isQ4) lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), -2);
+                lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q1_Qmin), -wm.WaterMeterData.ErrLimLoQ);
+                lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -wm.WaterMeterData.ErrLimLoQ);
+                lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q2_Qt), -wm.WaterMeterData.ErrLimHiQ);
+                lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q3_Qn), -wm.WaterMeterData.ErrLimHiQ);
+                if (isQ4) lowerLimit.Points.AddXY(Units.ConvertTo(flowUnit, wm.WaterMeterData.Q4_Qmax), -wm.WaterMeterData.ErrLimHiQ);
+            }
 
             Series line = new Series { Name = Strings.Relative_error, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.DeepSkyBlue };
             Series dots = new Series { Name = Strings.Relative_error + " ", ChartArea = "ChartArea1", ChartType = SeriesChartType.Point, Color = Color.RoyalBlue };
@@ -137,12 +204,38 @@ namespace Results.Output
 
             chart.ChartAreas.Add(chArea);
             chart.Legends.Add(legend1);
-            chart.Series.Add(upperLimit);
-            chart.Series.Add(lowerLimit);
+            if (upperLimit.Points.Count > 1) chart.Series.Add(upperLimit);
+            if (lowerLimit.Points.Count > 1) chart.Series.Add(lowerLimit);
             chart.Series.Add(dots);
             chart.Series.Add(line);
             
             return chart;
         }
+
+        static double GetErrorLimit(WaterMeter wm, Unit flowUnit, double x)
+        {
+            double flow_m3 = Units.ConvertFrom(flowUnit, x);
+            switch (Convert.ToInt32(wm.WaterMeterData.Q2_Qt))
+            {
+                default:
+                case 1: return Math.Min(3.5, 1.0 + 0.01 * wm.WaterMeterData.Q3_Qn / flow_m3);
+                case 2: return Math.Min(5.0, 2.0 + 0.02 * wm.WaterMeterData.Q3_Qn / flow_m3);
+                case 3: return Math.Min(5.0, 3.0 + 0.05 * wm.WaterMeterData.Q3_Qn / flow_m3);
+            }
+        }
+
+        static double GetQsharp(WaterMeter wm, Unit flowUnit)
+        {
+            double qSharp;
+            switch (Convert.ToInt32(wm.WaterMeterData.Q2_Qt))
+            {
+                default:
+                case 1: qSharp = (0.01 / 2.5) * wm.WaterMeterData.Q3_Qn; break;
+                case 2: qSharp = (0.02 / 3.0) * wm.WaterMeterData.Q3_Qn; break;
+                case 3: qSharp = (0.05 / 2.0) * wm.WaterMeterData.Q3_Qn; break;
+            }
+            return Units.ConvertTo(flowUnit, qSharp);
+
+        }
     }
 }

Results/Resources/Strings.pl.resx

@@ -163,22 +163,22 @@
     <value>Stan końcowy</value>
   </data>
   <data name="ErrLimHi" xml:space="preserve">
-    <value>Max. Dopuszczalny błąd</value>
+    <value>Max. dopuszczalny błąd</value>
   </data>
   <data name="ErrLimLo" xml:space="preserve">
-    <value>Min. Dopuszczalny błąd</value>
+    <value>Min. dopuszczalny błąd</value>
   </data>
   <data name="Error" xml:space="preserve">
     <value>Błąd</value>
   </data>
   <data name="ErrRef" xml:space="preserve">
-    <value>Zakres błędów</value>
+    <value>Błąd wzorcowy</value>
   </data>
   <data name="Err_aux" xml:space="preserve">
-    <value>Błąd dopuszczalny</value>
+    <value>Błąd dodatkowy</value>
   </data>
   <data name="Err_main" xml:space="preserve">
-    <value>Błąd podstawowy</value>
+    <value>Błąd główny</value>
   </data>
   <data name="Flow" xml:space="preserve">
     <value>Przepływ</value>

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

Results/WMeterRsltItemSpec.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -134,374 +134,369 @@ namespace Results
 		{
             AllItems = new List<WMeterRsltItemSpec>();
 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.String,    "String", "",    Quantity.String, ItemCategory.Other, (w, t, u, f, p) => f));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Separator, "Separator", "", Quantity.String, ItemCategory.Other, (w, t, u, f, p) => string.Empty));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.String,    "String", "",    Quantity.String, ItemCategory.Other, (w,t,u,f,p) => f));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Separator, "Separator", "", Quantity.String, ItemCategory.Other, (w,t,u,f,p) => string.Empty));
 
             /// Common
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_name,        Strings.Test + "()",           Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Name())));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Procedure_name,   Strings.Procedure,             Quantity.String, ItemCategory.Other,    (w, t, u, f, p) => FormatStr(f, w.ProcedureName())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Proc_description, Strings.Procedure_description, Quantity.String, ItemCategory.Other,    (w, t, u, f, p) => FormatStr(f, w.Batch.ProcedureDescription)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_number,     Strings.Batch_nr,              Quantity.Number, ItemCategory.Other,    (w, t, u, f, p) => FormatInt(f, w.BatchNr())));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_method,      Strings.Test_method + "()",    Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Method())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_Method_Elde, Strings.Test_method + " Elde ()", Quantity.String, ItemCategory.TestData, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).MethodElde())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_name,        Strings.Test + "()",              Quantity.String, ItemCategory.TestData, (w,t,u,f,p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Name())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Procedure_name,   Strings.Procedure,                Quantity.String, ItemCategory.Other,    (w,t,u,f,p) => FormatStr(f, w.ProcedureName())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Proc_description, Strings.Procedure_description,    Quantity.String, ItemCategory.Other,    (w,t,u,f,p) => FormatStr(f, w.Batch.ProcedureDescription)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_number,     Strings.Batch_nr,                 Quantity.Number, ItemCategory.Other,    (w,t,u,f,p) => FormatInt(f, w.BatchNr())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_method,      Strings.Test_method + "()",       Quantity.String, ItemCategory.TestData, (w,t,u,f,p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).Method())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_Method_Elde, Strings.Test_method + " Elde ()", Quantity.String, ItemCategory.TestData, (w,t,u,f,p) => FormatStr(f, (w.GetTestRslt(t) == null) ? "" : w.GetTestRslt(t).MethodElde())));
 
             ///
             /// Volume
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_volume,       Strings.Test_vol + "()",                                                  Quantity.Volume, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).TargetVolume())));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.VolumeCTV,		  string.Format("{0} CTV ()", Strings.VName_Vol),							Quantity.Volume, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).VolumeCTV)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,            string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeMeter) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()", Strings.VName_Vol), Strings.Tooltip_Vol_rm,    Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeRef) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeRef) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_main,       string.Format("{0} {1} ()", Strings.VName_Vol, Strings.main),             Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_aux,        string.Format("{0} {1} ()", Strings.VName_Vol, Strings.aux),              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeStart) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_main, Strings.Start_volume_main + "()",                                         Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_aux,  Strings.Start_volume_aux + "()",                                          Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume,        Strings.End_volume + "()",                                                Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeEnd) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd) : string.Empty)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_main,   Strings.End_volume_main + "()",                                           Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeEnd) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_aux,    Strings.End_volume_aux + "()",                                            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeEnd) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_volume,       Strings.Test_vol + "()",                                                  Quantity.Volume, ItemCategory.TestData,    (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).TargetVolume())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.VolumeCTV,		  string.Format("{0} CTV ()", Strings.VName_Vol),							Quantity.Volume, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).VolumeCTV)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,            string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,   Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeMeter) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u,f,p, "V4", w.GetMeterTestRslt(t).VolumeMeter) : string.Empty)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()", Strings.VName_Vol), Strings.Tooltip_Vol_rm,    Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeRef) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u,f,p, "V4", w.GetMeterTestRslt(t).VolumeRef) : string.Empty)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_main,       string.Format("{0} {1} ()", Strings.VName_Vol, Strings.main),             Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeMeter) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_aux,        string.Format("{0} {1} ()", Strings.VName_Vol, Strings.aux),              Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeMeter) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeStart) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u,f,p, "V4", w.GetMeterTestRslt(t).VolumeStart) : string.Empty)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_main, Strings.Start_volume_main + "()",                                         Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeStart) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume_aux,  Strings.Start_volume_aux + "()",                                          Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeStart) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume,        Strings.End_volume + "()",                                                Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).VolumeEnd) : ((w.GetMeterTestRslt(t) != null) ? FormatDbl(u,f,p, "V4", w.GetMeterTestRslt(t).VolumeEnd) : string.Empty)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_main,   Strings.End_volume_main + "()",                                           Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).VolumeEnd) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume_aux,    Strings.End_volume_aux + "()",                                            Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).VolumeEnd) : string.Empty));
 
 			///
 			/// Mass
 			/// 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start_raw, string.Format("{0} ST raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassStartRaw)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start,     string.Format("{0} ST ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassStart)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end_raw,   string.Format("{0} EN raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassEndRaw)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end,       string.Format("{0} EN ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassEnd)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass,           string.Format("{0} ()",        Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).MassEnd - w.GetTestRslt(t).MassStart)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start_raw, string.Format("{0} ST raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassStartRaw)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_start,     string.Format("{0} ST ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassStart)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end_raw,   string.Format("{0} EN raw ()", Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassEndRaw)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass_end,       string.Format("{0} EN ()",     Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassEnd)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mass,           string.Format("{0} ()",        Strings.VName_Mass), Quantity.Mass, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).MassEnd - w.GetTestRslt(t).MassStart)));
 
 			///
 			/// Density
 			/// 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Density,            Strings.Density + " ()",                         Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetTestRslt(t).DensityLine)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Density_correction, Strings.Density_correction + " ()",              Quantity.Density, ItemCategory.BenchData,  (w, t, u, f, p) => FormatDbl(u, f, p, "V3", Formulas.DensityCorrection(w.Batch.SampleDensity, w.Batch.SampleTemp))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Rho_Wa_calc,        string.Format("{0} of sample", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", w.Batch.SampleDensity)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RhoDistilledWtrAtMeLineTemp, string.Format("{0} of distilled water at T line", Strings.Density), Quantity.Density, ItemCategory.BenchData, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? 0 : Formulas.DistilledWaterDensityFromTemp((w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2))));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Density,            Strings.Density + " ()",                         Quantity.Density, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", w.GetTestRslt(t).DensityLine)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Density_correction, Strings.Density_correction + " ()",              Quantity.Density, ItemCategory.BenchData,  (w,t,u,f,p) => FormatDbl(u,f,p, "V3", Formulas.DensityCorrection(w.Batch.SampleDensity, w.Batch.SampleTemp))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Rho_Wa_calc,        string.Format("{0} of sample", Strings.Density), Quantity.Density, ItemCategory.TestResult, (w,t,u,f,p) => FormatDbl(u,f,p, "V4", w.Batch.SampleDensity)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.RhoDistilledWtrAtMeLineTemp, string.Format("{0} of distilled water at T line", Strings.Density), Quantity.Density, ItemCategory.BenchData, (w,t,u,f,p) => FormatDbl(u,f,p, "V4", (w.GetTestRslt(t) == null) ? 0 : Formulas.DistilledWaterDensityFromTemp((w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2))));
 
 			///
             /// Date and time 
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_start_time, Strings.T_start + "()", Quantity.DateTime, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).StartTime.ToString() : string.Format(f, w.GetTestRslt(t).StartTime))));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_end_time,   Strings.T_end + "()",   Quantity.DateTime, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).EndTime.ToString() : string.Format(f, w.GetTestRslt(t).EndTime))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_start_time, Strings.T_start + "()", Quantity.DateTime, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).StartTime.ToString() : string.Format(f, w.GetTestRslt(t).StartTime))));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_end_time,   Strings.T_end + "()",   Quantity.DateTime, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : (string.IsNullOrEmpty(f) ? w.GetTestRslt(t).EndTime.ToString() : string.Format(f, w.GetTestRslt(t).EndTime))));
 
             ///
             /// Time (duration) 
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Timestamp_start,        "Timestamp start ()",                                  Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).TimestampStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Timestamp_end,          "Timestamp end ()",                                    Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).TimestampEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time_ni,           Strings.T_s + "_ni()",                                 Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "V3", w.GetMeterTestRslt(t).TestTime)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time,              Strings.T_s + "()",                                    Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "F1", w.GetTestRslt(t).TestTime)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestTimeCorrection,     "Test time correction ()",                             Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).TestTimeCorrection)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TimeBtwnMassMsrmnts,    "Time between mass measurements ()",                   Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).TimeBtwnMassMsrmnts)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.PMax_test_time,         "Pressure test time ()",     "Pressure test time",     Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsPMaxTest())   ? "" : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).TestTime)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_start_time,    "Diverter start time ()",    "Diverter start time",    Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsDiverter())   ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_end_time,      "Diverter end time ()",      "Diverter end time",      Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsDiverter())   ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_valve_open_time,  "Start valve open time ()",  "Start valve open time",  Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsStartStop())  ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_valve_close_time, "Start valve close time ()", "Start valve close time", Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsStartStop())  ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).DiverterEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Timestamp_start,        "Timestamp start ()",                                  Quantity.Time, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u,f,p, "V4", w.GetMeterTestRslt(t).TimestampStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Timestamp_end,          "Timestamp end ()",                                    Quantity.Time, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u,f,p, "V4", w.GetMeterTestRslt(t).TimestampEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time_ni,           Strings.T_s + "_ni()",                                 Quantity.Time, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u,f,p, "V3", w.GetMeterTestRslt(t).TestTime)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_time,              Strings.T_s + "()",                                    Quantity.Time, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u,f,p, "F1", w.GetTestRslt(t).TestTime)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestTimeCorrection,     "Test time correction ()",                             Quantity.Time, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u,f,p, "F3", w.GetTestRslt(t).TestTimeCorrection)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.TimeBtwnMassMsrmnts,    "Time between mass measurements ()",                   Quantity.Time, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsRelErrTest()) ? "" : FormatDbl(u,f,p, "F0", w.GetTestRslt(t).TimeBtwnMassMsrmnts)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.PMax_test_time,         "Pressure test time ()",     "Pressure test time",     Quantity.Time, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsPMaxTest())   ? "" : FormatDbl(u,f,p, "F0", w.GetTestRslt(t).TestTime)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_start_time,    "Diverter start time ()",    "Diverter start time",    Quantity.Time, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsDiverter())   ? "" : FormatDbl(u,f,p, "F3", w.GetTestRslt(t).DiverterStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter_end_time,      "Diverter end time ()",      "Diverter end time",      Quantity.Time, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsDiverter())   ? "" : FormatDbl(u,f,p, "F3", w.GetTestRslt(t).DiverterEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_valve_open_time,  "Start valve open time ()",  "Start valve open time",  Quantity.Time, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsStartStop())  ? "" : FormatDbl(u,f,p, "F3", w.GetTestRslt(t).DiverterStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_valve_close_time, "Start valve close time ()", "Start valve close time", Quantity.Time, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null      || !w.GetTestRslt(t).IsStartStop())  ? "" : FormatDbl(u,f,p, "F3", w.GetTestRslt(t).DiverterEnd)));
 
             ///
             /// Flow
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from,      string.Format("{0} {1}", Strings.VName_Flow, Strings.from),                   Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qfrom())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to,        string.Format("{0} {1}", Strings.VName_Flow, Strings.to),                     Quantity.Flow, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).Qto())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow,        string.Format("{0} v r", Strings.VName_Flow),      Strings.Tooltip_Q_v_r,     Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowVolume)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean,  string.Format("{0} rim ()", Strings.VName_Flow),   Strings.Tooltip_Q_rim,     Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min,   string.Format("{0} ref min ()", Strings.VName_Flow), Strings.Tooltip_Q_min,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMin)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max,   string.Format("{0} ref max ()", Strings.VName_Flow), Strings.Tooltip_Q_max,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} ref start ()",Strings.VName_Flow),Strings.Tooltip_Q_start, Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end,   string.Format("{0} ref end ()", Strings.VName_Flow), Strings.Tooltip_Q_end,   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).FlowEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Qc, string.Format("Qc"), "Calculated water meter flow",                                    Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", (w.GetMeterTestRslt(t).TestTime == 0 || w.GetTestRslt(t).PulsesMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv, string.Format("{0} ctv ()", Strings.VName_Flow), "CTV of the flow (mean val.)",  Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V5", (w.GetMeterTestRslt(t).TestTime == 0 || w.GetTestRslt(t).PulsesMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetMeterTestRslt(t).TestTime * 3.6 * w.GetMeterTestRslt(t).PulsesMaster / w.GetTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_min, string.Format("{0} ctv min ()", Strings.VName_Flow), "Min. CTV of the flow", Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMin / w.GetTestRslt(t).VolumeMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_max, string.Format("{0} ctv max ()", Strings.VName_Flow), "Max. CTV of the flow", Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowMax / w.GetTestRslt(t).VolumeMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_start, string.Format("{0} ctv start ()", Strings.VName_Flow), "Start flow CTV",   Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowStart / w.GetTestRslt(t).VolumeMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv_end, string.Format("{0} ctv end ()", Strings.VName_Flow), "End flow CTV",         Quantity.Flow, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).VolumeMaster == 0) ? 0 : w.GetTestRslt(t).VolumeCTV * w.GetTestRslt(t).FlowEnd / w.GetTestRslt(t).VolumeMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise, string.Format("{0} {1}", Strings.VName_Flow, Strings.rise),                        Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : ""));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall,      string.Format("{0} {1}", Strings.VName_Flow, Strings.fall),                   Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QFall)) : ""));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_sensitivity, string.Format("{0} {1}", Strings.VName_Flow, Strings.sensitivity),          Quantity.Flow, ItemCategory.MeterResult, (w, t, u, f, p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u, f, p, "V3", w.QRise)) : ""));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_from,      string.Format("{0} {1}", Strings.VName_Flow, Strings.from),                 Quantity.Flow, ItemCategory.TestData,    (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).Qfrom())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_to,        string.Format("{0} {1}", Strings.VName_Flow, Strings.to),                   Quantity.Flow, ItemCategory.TestData,    (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).Qto())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow,        string.Format("{0} v r", Strings.VName_Flow),     Strings.Tooltip_Q_v_r,    Quantity.Flow, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).Flow)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_mean,  string.Format("{0} mean ()", Strings.VName_Flow), Strings.Tooltip_Q_rim,    Quantity.Flow, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).FlowMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_min,   string.Format("{0} min ()", Strings.VName_Flow),  Strings.Tooltip_Q_min,    Quantity.Flow, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).FlowMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_max,   string.Format("{0} max ()", Strings.VName_Flow),  Strings.Tooltip_Q_max,    Quantity.Flow, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).FlowMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_start, string.Format("{0} start ()",Strings.VName_Flow), Strings.Tooltip_Q_start,  Quantity.Flow, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).FlowStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_ref_end,   string.Format("{0} end ()", Strings.VName_Flow),  Strings.Tooltip_Q_end,    Quantity.Flow, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).FlowEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_rise,      string.Format("{0} {1}", Strings.VName_Flow, Strings.rise),                 Quantity.Flow, ItemCategory.MeterResult, (w,t,u,f,p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u,f,p, "V3", w.QRise)) : ""));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_fall,      string.Format("{0} {1}", Strings.VName_Flow, Strings.fall),                 Quantity.Flow, ItemCategory.MeterResult, (w,t,u,f,p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QFall == 0) ? "-" : FormatDbl(u,f,p, "V3", w.QFall)) : ""));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q_sensitivity, string.Format("{0} {1}", Strings.VName_Flow, Strings.sensitivity),        Quantity.Flow, ItemCategory.MeterResult, (w,t,u,f,p) => (string.IsNullOrEmpty(t) || (w.GetTestRslt(t) != null)) ? ((w.QRise == 0) ? "-" : FormatDbl(u,f,p, "V3", w.QRise)) : ""));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMaster,    string.Format("k MID ()"), "Const. of the reference flow meter",           Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMaster < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMaster)))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterRaw, string.Format("k MID raw ()"),"Const. of the ref. flow meter uncorrected", Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMasterRaw < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterRaw)))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterCorr,string.Format("k MID corr ()"), "Const. of the ref. flow meter corrected", Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", ((w.GetTestRslt(t).ConstMasterCorr < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterCorr)))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMaster,    string.Format("k MID ()"), "Const.of the reference flow meter",          Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", ((w.GetTestRslt(t).ConstMaster < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMaster)))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterRaw, string.Format("k MID raw ()"),"Const.of the ref.flow meter uncorrected", Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", ((w.GetTestRslt(t).ConstMasterRaw < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterRaw)))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ConstMasterCorr,string.Format("k MID corr ()"), "Const.of the ref.flow meter corrected", Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V4", ((w.GetTestRslt(t).ConstMasterCorr < float.Epsilon) ? 0 : (1 / w.GetTestRslt(t).ConstMasterCorr)))));
 
             ///
             /// Temperature
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_mean,    string.Format("{0} UP ME ()",  Strings.VName_Temp), Strings.Tooltip_T_up_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_start,   string.Format("{0} UP ST ()",  Strings.VName_Temp), Strings.Tooltip_T_up_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_end,     string.Format("{0} UP EN ()",  Strings.VName_Temp), Strings.Tooltip_T_up_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_avg,     string.Format("{0} UP avg ()", Strings.VName_Temp), Strings.Tooltip_T_up_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempUpEnd) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_min,     string.Format("{0} UP min ()", Strings.VName_Temp), Strings.Tooltip_T_up_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpMin)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_max,     string.Format("{0} UP max ()", Strings.VName_Temp), Strings.Tooltip_T_up_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempUpMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_mean,  string.Format("{0} LN ME ()",  Strings.VName_Temp), Strings.Tooltip_T_ln_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_start, string.Format("{0} LN ST ()",  Strings.VName_Temp), Strings.Tooltip_T_ln_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempDownStart) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_end,   string.Format("{0} LN EN ()",  Strings.VName_Temp), Strings.Tooltip_T_ln_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpEnd + w.GetTestRslt(t).TempDownEnd) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_avg,   string.Format("{0} LN avg ()", Strings.VName_Temp), Strings.Tooltip_T_ln_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempDownStart + w.GetTestRslt(t).TempUpEnd + w.GetTestRslt(t).TempDownEnd) / 4)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_min,   string.Format("{0} LN min ()", Strings.VName_Temp), Strings.Tooltip_T_ln_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpMin + w.GetTestRslt(t).TempDownMin) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_max,   string.Format("{0} LN max ()", Strings.VName_Temp), Strings.Tooltip_T_ln_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempUpMax + w.GetTestRslt(t).TempDownMax) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_mean,  string.Format("{0} DW ME ()",  Strings.VName_Temp), Strings.Tooltip_T_dw_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_start, string.Format("{0} DW ST ()",  Strings.VName_Temp), Strings.Tooltip_T_dw_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_end,   string.Format("{0} DW EN ()",  Strings.VName_Temp), Strings.Tooltip_T_dw_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_avg,   string.Format("{0} DW avg ()", Strings.VName_Temp), Strings.Tooltip_T_dw_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempDownStart + w.GetTestRslt(t).TempDownEnd) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_min,   string.Format("{0} DW min ()", Strings.VName_Temp), Strings.Tooltip_T_dw_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownMin)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_max,   string.Format("{0} DW max ()", Strings.VName_Temp), Strings.Tooltip_T_dw_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDownMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div,        string.Format("{0} DI ME ()",  Strings.VName_Temp), Strings.Tooltip_T_di_me,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_start,  string.Format("{0} DI ST ()",  Strings.VName_Temp), Strings.Tooltip_T_di_st,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_end,    string.Format("{0} DI EN ()",  Strings.VName_Temp), Strings.Tooltip_T_di_en,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_avg,    string.Format("{0} DI avg ()", Strings.VName_Temp), Strings.Tooltip_T_di_avg, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).TempDivStart + w.GetTestRslt(t).TempDivEnd) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_min,    string.Format("{0} DI min ()", Strings.VName_Temp), Strings.Tooltip_T_di_min, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMin)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_max,    string.Format("{0} DI max ()", Strings.VName_Temp), Strings.Tooltip_T_di_max, Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).TempDivMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_rho_0,      string.Format("{0} RO0", Strings.VName_Temp),       Strings.Tooltip_T_rho_0,  Quantity.Temperature, ItemCategory.BenchData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Batch.SampleTemp)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_mean,    string.Format("{0} UP ME ()",  Strings.VName_Temp), Strings.Tooltip_T_up_me,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempUpMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_start,   string.Format("{0} UP ST ()",  Strings.VName_Temp), Strings.Tooltip_T_up_st,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempUpStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_end,     string.Format("{0} UP EN ()",  Strings.VName_Temp), Strings.Tooltip_T_up_en,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempUpEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_avg,     string.Format("{0} UP avg ()", Strings.VName_Temp), Strings.Tooltip_T_up_avg, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempUpEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_min,     string.Format("{0} UP min ()", Strings.VName_Temp), Strings.Tooltip_T_up_min, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempUpMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_up_max,     string.Format("{0} UP max ()", Strings.VName_Temp), Strings.Tooltip_T_up_max, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempUpMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_mean,  string.Format("{0} LN ME ()",  Strings.VName_Temp), Strings.Tooltip_T_ln_me,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).TempUpMean + w.GetTestRslt(t).TempDownMean) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_start, string.Format("{0} LN ST ()",  Strings.VName_Temp), Strings.Tooltip_T_ln_st,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempDownStart) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_end,   string.Format("{0} LN EN ()",  Strings.VName_Temp), Strings.Tooltip_T_ln_en,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).TempUpEnd + w.GetTestRslt(t).TempDownEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_avg,   string.Format("{0} LN avg ()", Strings.VName_Temp), Strings.Tooltip_T_ln_avg, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).TempUpStart + w.GetTestRslt(t).TempDownStart + w.GetTestRslt(t).TempUpEnd + w.GetTestRslt(t).TempDownEnd) / 4)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_min,   string.Format("{0} LN min ()", Strings.VName_Temp), Strings.Tooltip_T_ln_min, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).TempUpMin + w.GetTestRslt(t).TempDownMin) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_line_max,   string.Format("{0} LN max ()", Strings.VName_Temp), Strings.Tooltip_T_ln_max, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).TempUpMax + w.GetTestRslt(t).TempDownMax) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_mean,  string.Format("{0} DW ME ()",  Strings.VName_Temp), Strings.Tooltip_T_dw_me,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDownMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_start, string.Format("{0} DW ST ()",  Strings.VName_Temp), Strings.Tooltip_T_dw_st,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDownStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_end,   string.Format("{0} DW EN ()",  Strings.VName_Temp), Strings.Tooltip_T_dw_en,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDownEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_avg,   string.Format("{0} DW avg ()", Strings.VName_Temp), Strings.Tooltip_T_dw_avg, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).TempDownStart + w.GetTestRslt(t).TempDownEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_min,   string.Format("{0} DW min ()", Strings.VName_Temp), Strings.Tooltip_T_dw_min, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDownMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_down_max,   string.Format("{0} DW max ()", Strings.VName_Temp), Strings.Tooltip_T_dw_max, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDownMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div,        string.Format("{0} DI ME ()",  Strings.VName_Temp), Strings.Tooltip_T_di_me,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDivMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_start,  string.Format("{0} DI ST ()",  Strings.VName_Temp), Strings.Tooltip_T_di_st,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDivStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_end,    string.Format("{0} DI EN ()",  Strings.VName_Temp), Strings.Tooltip_T_di_en,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDivEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_avg,    string.Format("{0} DI avg ()", Strings.VName_Temp), Strings.Tooltip_T_di_avg, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).TempDivStart + w.GetTestRslt(t).TempDivEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_min,    string.Format("{0} DI min ()", Strings.VName_Temp), Strings.Tooltip_T_di_min, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDivMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_div_max,    string.Format("{0} DI max ()", Strings.VName_Temp), Strings.Tooltip_T_di_max, Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).TempDivMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_rho_0,      string.Format("{0} RO0", Strings.VName_Temp),       Strings.Tooltip_T_rho_0,  Quantity.Temperature, ItemCategory.BenchData,  (w,t,u,f,p) => FormatDbl(u,f,p, "V3", w.Batch.SampleTemp)));
 #if HEAT_METERS
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_mean,  string.Format("{0} hi me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom1)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_start, string.Format("{0} hi st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_end,   string.Format("{0} hi en", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom3)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_avg,   string.Format("{0} hi av", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", (w.GetTestRslt(t).Custom2 + w.GetTestRslt(t).Custom3) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_mean,  string.Format("{0} lo me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom6)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_start, string.Format("{0} lo st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom7)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_end,   string.Format("{0} lo en", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom8)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_avg,   string.Format("{0} lo av", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", (w.GetTestRslt(t).Custom7 + w.GetTestRslt(t).Custom8) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_mean,  string.Format("{0} hi me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom1)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_start, string.Format("{0} hi st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_end,   string.Format("{0} hi en", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom3)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Hi_avg,   string.Format("{0} hi av", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", (w.GetTestRslt(t).Custom2 + w.GetTestRslt(t).Custom3) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_mean,  string.Format("{0} lo me", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom6)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_start, string.Format("{0} lo st", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom7)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_end,   string.Format("{0} lo en", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).Custom8)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.T_Lo_avg,   string.Format("{0} lo av", Strings.VName_Temp), Quantity.Temperature, ItemCategory.Other, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F3", (w.GetTestRslt(t).Custom7 + w.GetTestRslt(t).Custom8) / 2)));
 #endif
 
             ///
             /// Pressure
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up,          string.Format("{0} UP ME ()",  Strings.VName_Press), Strings.Tooltip_P_up_me,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_start,    string.Format("{0} UP ST ()",  Strings.VName_Press), Strings.Tooltip_P_up_st,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_end,      string.Format("{0} UP EN ()",  Strings.VName_Press), Strings.Tooltip_P_up_en,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_avg,      string.Format("{0} UP avg ()", Strings.VName_Press), Strings.Tooltip_P_up_avg, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).PressUpStart + w.GetTestRslt(t).PressUpEnd) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_min,      string.Format("{0} UP min ()", Strings.VName_Press), Strings.Tooltip_P_up_min, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpMin)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_max,      string.Format("{0} UP max ()", Strings.VName_Press), Strings.Tooltip_P_up_max, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down,        string.Format("{0} DW ME ()",  Strings.VName_Press), Strings.Tooltip_P_dw_me,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_start,  string.Format("{0} DW ST ()",  Strings.VName_Press), Strings.Tooltip_P_dw_st,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_end,    string.Format("{0} DW EN ()",  Strings.VName_Press), Strings.Tooltip_P_dw_en,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_avg,    string.Format("{0} DW avg ()", Strings.VName_Press), Strings.Tooltip_P_dw_avg, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).PressDownStart + w.GetTestRslt(t).PressDownEnd) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_min,    string.Format("{0} DW min ()", Strings.VName_Press), Strings.Tooltip_P_dw_min, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownMin)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_max,    string.Format("{0} DW max ()", Strings.VName_Press), Strings.Tooltip_P_dw_max, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDownMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean,  string.Format("{0} DE ME ()",  Strings.VName_Press), Strings.Tooltip_P_de_me,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_start, string.Format("{0} DE ST ()",  Strings.VName_Press), Strings.Tooltip_P_de_st,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_end,   string.Format("{0} DE EN ()",  Strings.VName_Press), Strings.Tooltip_P_de_en,  Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_avg,   string.Format("{0} DE avg ()", Strings.VName_Press), Strings.Tooltip_P_de_avg, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).PressDeltaStart + w.GetTestRslt(t).PressDeltaEnd) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_min,   string.Format("{0} DE min ()", Strings.VName_Press), Strings.Tooltip_P_de_min, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaMin)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_max,   string.Format("{0} DE max ()", Strings.VName_Press), Strings.Tooltip_P_de_max, Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaMax)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean_per_mtr, string.Format("{0} DE ME per mtr.()", Strings.VName_Press), "P delta mean per one meter", Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressDeltaMean / Math.Max(1, w.GetTestRslt(t).Batch.WaterMeters.Count))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean_from_up_down, string.Format("{0} UP-DW ME ()", Strings.VName_Press), "P delta mean from UP/DW", Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).PressUpMean - w.GetTestRslt(t).PressDownMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean_from_up_down_per_mtr, string.Format("{0} UP-DW ME per mtr ()", Strings.VName_Press), "P delta mean from UP/DW per one meter", Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).PressUpMean - w.GetTestRslt(t).PressDownMean) / Math.Max(1, w.GetTestRslt(t).Batch.WaterMeters.Count))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_PMax_test_mean, string.Format("{0} PMax mean ()", Strings.VName_Press), "Mean PMax test pressure", Quantity.Pressure, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null || !w.GetTestRslt(t).IsPMaxTest()) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).PressUpMean + w.GetTestRslt(t).PressDownMean) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up,          string.Format("{0} UP ME ()",  Strings.VName_Press), Strings.Tooltip_P_up_me,  Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressUpMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_start,    string.Format("{0} UP ST ()",  Strings.VName_Press), Strings.Tooltip_P_up_st,  Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressUpStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_end,      string.Format("{0} UP EN ()",  Strings.VName_Press), Strings.Tooltip_P_up_en,  Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressUpEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_avg,      string.Format("{0} UP avg ()", Strings.VName_Press), Strings.Tooltip_P_up_avg, Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).PressUpStart + w.GetTestRslt(t).PressUpEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_min,      string.Format("{0} UP min ()", Strings.VName_Press), Strings.Tooltip_P_up_min, Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressUpMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_up_max,      string.Format("{0} UP max ()", Strings.VName_Press), Strings.Tooltip_P_up_max, Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressUpMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down,        string.Format("{0} DW ME ()",  Strings.VName_Press), Strings.Tooltip_P_dw_me,  Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDownMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_start,  string.Format("{0} DW ST ()",  Strings.VName_Press), Strings.Tooltip_P_dw_st,  Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDownStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_end,    string.Format("{0} DW EN ()",  Strings.VName_Press), Strings.Tooltip_P_dw_en,  Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDownEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_avg,    string.Format("{0} DW avg ()", Strings.VName_Press), Strings.Tooltip_P_dw_avg, Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).PressDownStart + w.GetTestRslt(t).PressDownEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_min,    string.Format("{0} DW min ()", Strings.VName_Press), Strings.Tooltip_P_dw_min, Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDownMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_down_max,    string.Format("{0} DW max ()", Strings.VName_Press), Strings.Tooltip_P_dw_max, Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDownMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean,  string.Format("{0} DE ME ()",  Strings.VName_Press), Strings.Tooltip_P_de_me,  Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDeltaMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_start, string.Format("{0} DE ST ()",  Strings.VName_Press), Strings.Tooltip_P_de_st,  Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDeltaStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_end,   string.Format("{0} DE EN ()",  Strings.VName_Press), Strings.Tooltip_P_de_en,  Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDeltaEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_avg,   string.Format("{0} DE avg ()", Strings.VName_Press), Strings.Tooltip_P_de_avg, Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).PressDeltaStart + w.GetTestRslt(t).PressDeltaEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_min,   string.Format("{0} DE min ()", Strings.VName_Press), Strings.Tooltip_P_de_min, Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDeltaMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_max,   string.Format("{0} DE max ()", Strings.VName_Press), Strings.Tooltip_P_de_max, Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDeltaMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean_per_mtr, string.Format("{0} DE ME per mtr.()", Strings.VName_Press), "P delta mean per one meter", Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressDeltaMean / Math.Max(1, w.GetTestRslt(t).Batch.WaterMeters.Count))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean_from_up_down, string.Format("{0} UP-DW ME ()", Strings.VName_Press), "P delta mean from UP/DW", Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).PressUpMean - w.GetTestRslt(t).PressDownMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_delta_mean_from_up_down_per_mtr, string.Format("{0} UP-DW ME per mtr ()", Strings.VName_Press), "P delta mean from UP/DW per one meter", Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).PressUpMean - w.GetTestRslt(t).PressDownMean) / Math.Max(1, w.GetTestRslt(t).Batch.WaterMeters.Count))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.P_PMax_test_mean, string.Format("{0} PMax mean ()", Strings.VName_Press), "Mean PMax test pressure", Quantity.Pressure, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null || !w.GetTestRslt(t).IsPMaxTest()) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).PressUpMean + w.GetTestRslt(t).PressDownMean) / 2)));
 
             ///
             /// Electrical conductivity of water
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct,       string.Format("{0} ME ()",  Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).ConductMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_start, string.Format("{0} ST ()",  Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).ConductStart)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_end,   string.Format("{0} EN ()",  Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).ConductEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_avg,   string.Format("{0} avg ()", Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", (w.GetTestRslt(t).ConductStart + w.GetTestRslt(t).ConductEnd) / 2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_min,   string.Format("{0} min ()", Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).ConductMin)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_max,   string.Format("{0} max ()", Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).ConductMax)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct,       string.Format("{0} ME ()",  Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).ConductMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_start, string.Format("{0} ST ()",  Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).ConductStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_end,   string.Format("{0} EN ()",  Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).ConductEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_avg,   string.Format("{0} avg ()", Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", (w.GetTestRslt(t).ConductStart + w.GetTestRslt(t).ConductEnd) / 2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_min,   string.Format("{0} min ()", Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).ConductMin)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Conduct_max,   string.Format("{0} max ()", Strings.VName_Conduct), Quantity.Conductivity, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V3", w.GetTestRslt(t).ConductMax)));
 
             ///
             /// Ambient temperature/pressure/humidity/Buoyancy
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_temperature, string.Format("{0} Amb M", Strings.VName_Temp),     Strings.Tooltip_T_Amb_M,  Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", (w.GetTestRslt(t) == null) ? w.Batch.AmbTempMean()  : w.GetTestRslt(t).AmbTempMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_pressure,    string.Format("{0} Amb M", Strings.VName_Press),    Strings.Tooltip_P_Amb_M,  Quantity.Pressure,    ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? w.Batch.AmbPressMean() : w.GetTestRslt(t).AmbPressMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_humidity,    string.Format("{0} Amb M", Strings.VName_Humi),     Strings.Tooltip_Hu_Amb_M, Quantity.Humidity,    ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V2", (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiMean()  : w.GetTestRslt(t).AmbHumiMean)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Amb_temp_start_end,  string.Format("{0} Amb ST/EN", Strings.VName_Temp),                           Quantity.Temperature, ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", (w.GetTestRslt(t) == null) ? w.Batch.AmbTempStart() : w.GetTestRslt(t).AmbTempStart,  (w.GetTestRslt(t) == null) ? w.Batch.AmbTempEnd()  : w.GetTestRslt(t).AmbTempEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Amb_press_start_end, string.Format("{0} Amb ST/EN", Strings.VName_Press),                          Quantity.Pressure,    ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.GetTestRslt(t) == null) ? w.Batch.AmbPressStart(): w.GetTestRslt(t).AmbPressStart, (w.GetTestRslt(t) == null) ? w.Batch.AmbPressEnd() : w.GetTestRslt(t).AmbPressEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Amb_humi_start_end,  string.Format("{0} Amb ST/EN", Strings.VName_Humi),                           Quantity.Humidity,    ItemCategory.TestResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V2", (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiStart() : w.GetTestRslt(t).AmbHumiStart,  (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiEnd()  : w.GetTestRslt(t).AmbHumiEnd)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Buoyancy,            "Buoyancy",                                                                   Quantity.Number,      ItemCategory.BenchData,  (w, t, u, f, p) => FormatDbl(u, f, p, "V6", w.Batch.Buoyancy)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_temperature, string.Format("{0} Amb M", Strings.VName_Temp),     Strings.Tooltip_T_Amb_M,  Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => FormatDbl(u,f,p, "V3", (w.GetTestRslt(t) == null) ? w.Batch.AmbTempMean()  : w.GetTestRslt(t).AmbTempMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_pressure,    string.Format("{0} Amb M", Strings.VName_Press),    Strings.Tooltip_P_Amb_M,  Quantity.Pressure,    ItemCategory.TestResult, (w,t,u,f,p) => FormatDbl(u,f,p, "V4", (w.GetTestRslt(t) == null) ? w.Batch.AmbPressMean() : w.GetTestRslt(t).AmbPressMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Ambient_humidity,    string.Format("{0} Amb M", Strings.VName_Humi),     Strings.Tooltip_Hu_Amb_M, Quantity.Humidity,    ItemCategory.TestResult, (w,t,u,f,p) => FormatDbl(u,f,p, "V2", (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiMean()  : w.GetTestRslt(t).AmbHumiMean)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Amb_temp_start_end,  string.Format("{0} Amb ST/EN", Strings.VName_Temp),                           Quantity.Temperature, ItemCategory.TestResult, (w,t,u,f,p) => FormatDbl(u,f,p, "V3", (w.GetTestRslt(t) == null) ? w.Batch.AmbTempStart() : w.GetTestRslt(t).AmbTempStart,  (w.GetTestRslt(t) == null) ? w.Batch.AmbTempEnd()  : w.GetTestRslt(t).AmbTempEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Amb_press_start_end, string.Format("{0} Amb ST/EN", Strings.VName_Press),                          Quantity.Pressure,    ItemCategory.TestResult, (w,t,u,f,p) => FormatDbl(u,f,p, "V4", (w.GetTestRslt(t) == null) ? w.Batch.AmbPressStart(): w.GetTestRslt(t).AmbPressStart, (w.GetTestRslt(t) == null) ? w.Batch.AmbPressEnd() : w.GetTestRslt(t).AmbPressEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Amb_humi_start_end,  string.Format("{0} Amb ST/EN", Strings.VName_Humi),                           Quantity.Humidity,    ItemCategory.TestResult, (w,t,u,f,p) => FormatDbl(u,f,p, "V2", (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiStart() : w.GetTestRslt(t).AmbHumiStart,  (w.GetTestRslt(t) == null) ? w.Batch.AmbHumiEnd()  : w.GetTestRslt(t).AmbHumiEnd)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Buoyancy,            "Buoyancy",                                                                   Quantity.Number,      ItemCategory.BenchData,  (w,t,u,f,p) => FormatDbl(u,f,p, "V6", w.Batch.Buoyancy)));
 
             ///
             /// Error
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Lo,  Strings.ErrLimLo + "()",    Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimLo())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Hi,  Strings.ErrLimHi + "()",    Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimHi())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty,     Strings.Uncertainty + "()", Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimMargin())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error, string.Format("{0} rel.ref. ()", Strings.VName_Error), Strings.Tooltip_E_rel_ref, Quantity.Error, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrorMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error_corr, string.Format("{0} ref.corr. ()", Strings.VName_Error), "Relative error of the reference flow meter after correction using correction curve", Quantity.Error, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", Formulas.ErrorFromVolumes(w.GetTestRslt(t).ConstMasterCorr, w.GetTestRslt(t).ConstMaster))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Lo,  Strings.ErrLimLo + "()",    Quantity.Error, ItemCategory.TestData, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V2", w.GetTestRslt(t).ErrLimLo())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Hi,  Strings.ErrLimHi + "()",    Quantity.Error, ItemCategory.TestData, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V2", w.GetTestRslt(t).ErrLimHi())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty,     Strings.Uncertainty + "()", Quantity.Error, ItemCategory.TestData, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V2", w.GetTestRslt(t).ErrLimMargin())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error, string.Format("{0} rel.ref. ()", Strings.VName_Error), Strings.Tooltip_E_rel_ref, Quantity.Error, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V2", w.GetTestRslt(t).ErrorMaster)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error_corr, string.Format("{0} ref.corr. ()", Strings.VName_Error), "Relative error of the reference flow meter after correction using correction curve", Quantity.Error, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "V2", Formulas.ErrorFromVolumes(w.GetTestRslt(t).ConstMasterCorr, w.GetTestRslt(t).ConstMaster))));
 #if ORACLE_DB
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.LastError, string.Format("{0} rel. last ()", Strings.VName_Error), Strings.Tooltip_E_rel_last, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).LastError)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.LastError, string.Format("{0} rel. last ()", Strings.VName_Error), Strings.Tooltip_E_rel_last, Quantity.Error, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).LastError)));
 #else
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_heat_mtr_vol, string.Format("{0} rel.hm.vol. ()", Strings.VName_Error),    Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).Error) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) != null) ? FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_heat_mtr_vol, string.Format("{0} rel.hm.vol. ()", Strings.VName_Error),    Quantity.Error, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume) != null) ? FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterVolume).Error) : string.Empty));
 #endif
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr(f)
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w,t,u,f,p) => string.IsNullOrEmpty(t) ? w.PassedColorStr(f)
                                                                                                                                                                       : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr(f))));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ThreeState, "Three state result", Quantity.Enumerated, ItemCategory.MeterResult, (w, t, u, f, p) => FormatThreeState(f, w.ThreeStateFromTests())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ThreeState, "Three state result", Quantity.Enumerated, ItemCategory.MeterResult, (w,t,u,f,p) => FormatThreeState(f, w.ThreeStateFromTests())));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RefFlowmeter, "Ref. flowmeter", Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RefFlowmeter()) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Scale,        "Scale",          Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Scale())        : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter,     "Diverter",       Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Diverter())     : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RegValve,     "Reg. valve",     Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RegValve())     : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.RefFlowmeter,       "Ref. flowmeter", Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RefFlowmeter()) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Scale,              "Scale",          Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Scale())        : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter,           "Diverter",       Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Diverter())     : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.RegValve,           "Reg. valve",     Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RegValve())     : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E",   Quantity.String, ItemCategory.MeterResult,(w, t, u, f, p) => (w.GetMeterTestRslt(t) != null) ? FormatStr(f, w.GetMeterTestRslt(t).PassedOrErrorFlagsStr())
+                                                                                                                                                                                          : FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
 
             ///
             /// Water meter info
             ///
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeter_type, Strings.WM_Type, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.ProductName)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Producer, Strings.Producer, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Producer)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeter_type, Strings.WM_Type, Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.ProductName)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Producer, Strings.Producer, Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Producer)));
 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.DN,       "DN",             Quantity.Length, ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V2", w.WaterMeterData.DN)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.L,        "L",              Quantity.Length, ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.L)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mounting, Strings.Mounting, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Mounting.ToDescription())));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q4,       "Q4_Qmax",        Quantity.Flow,   ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.Q4_Qmax)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q3,       "Q3_Qn",          Quantity.Flow,   ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V2", w.WaterMeterData.Q3_Qn)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2,       "Q2_Qt",          Quantity.Flow,   ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.Q2_Qt)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q1,       "Q1_Qmin",        Quantity.Flow,   ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.Q1_Qmin)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.DN,       "DN",             Quantity.Length, ItemCategory.MeterData, (w,t,u,f,p) => FormatDbl(u, f, p, "V2", w.WaterMeterData.DN)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.L,        "L",              Quantity.Length, ItemCategory.MeterData, (w,t,u,f,p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.L)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Mounting, Strings.Mounting, Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Mounting.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q4,       "Q4_Qmax",        Quantity.Flow,   ItemCategory.MeterData, (w,t,u,f,p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.Q4_Qmax)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q3,       "Q3_Qn",          Quantity.Flow,   ItemCategory.MeterData, (w,t,u,f,p) => FormatDbl(u, f, p, "V2", w.WaterMeterData.Q3_Qn)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2,       "Q2_Qt",          Quantity.Flow,   ItemCategory.MeterData, (w,t,u,f,p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.Q2_Qt)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q1,       "Q1_Qmin",        Quantity.Flow,   ItemCategory.MeterData, (w,t,u,f,p) => FormatDbl(u, f, p, "V3", w.WaterMeterData.Q1_Qmin)));
 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Metrological_class,             Strings.MClass,                   Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.MetrologicalClass)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Temperature_class,              "Temperature class",              Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.TemperatureClass.ToDescription())));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Pressure_loss_class,            "Pressure loss class",            Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.PressureLossClass.ToDescription())));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_admissible_pressure,        "Max. admissible pressure",       Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.MaxAdmissiblePressure.ToDescription())));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_profile_sensitivity_class, "Flow profile sensitivity class", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.FlowProfileSensitivityClass.ToDescription())));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Approval_info,                  Strings.Approval,                 Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.ApprovalInfo)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Certificate,                    "Certificate",                    Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Certificate)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Medium,                         "Water cold/hot",                 Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Medium.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Metrological_class,             Strings.MClass,                   Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.MetrologicalClass)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Temperature_class,              "Temperature class",              Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.TemperatureClass.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Pressure_loss_class,            "Pressure loss class",            Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.PressureLossClass.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_admissible_pressure,        "Max. admissible pressure",       Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.MaxAdmissiblePressure.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_profile_sensitivity_class, "Flow profile sensitivity class", Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.FlowProfileSensitivityClass.ToDescription())));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Approval_info,                  Strings.Approval,                 Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.ApprovalInfo)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Certificate,                    "Certificate",                    Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Certificate)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Medium,                         "Water cold/hot",                 Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Medium.ToDescription())));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text1, "Text1", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text1)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text2, "Text2", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text2)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text3, "Text3", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text3)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text4, "Text4", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text4)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text5)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text1, "Text1", Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Text1)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text2, "Text2", Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Text2)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text3, "Text3", Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Text3)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text4, "Text4", Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Text4)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Text5, "Text5", Quantity.String, ItemCategory.MeterData, (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Text5)));
 
             /// Water meters results
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr,          Strings.sn,      Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.RadioAddress, Strings.Radio_address, Strings.Tooltip_RA, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr,          Strings.sn,      Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.SerialNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.RadioAddress, Strings.Radio_address, Strings.Tooltip_RA, Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.RadioAddress)));
 #if ORACLE_DB
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OriRadioAddress, "Original " + Strings.Radio_address,    Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.OriRadioAddress)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.OriRadioAddress, "Original " + Strings.Radio_address,    Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.OriRadioAddress)));
 #endif
-            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)));
+            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)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses,              Strings.Pulses + "()",       Quantity.Pulses,       ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).IsPulses() ? w.GetMeterTestRslt(t).PulsesMeter : 0)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses_ni, Strings.RefPulses + "_ni()", Quantity.Pulses,       ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses,    Strings.RefPulses + "()",    Quantity.Pulses,       ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).PulsesMaster)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle,        "Angle ()",       "Angle measured by a camera",       Quantity.Pulses, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesMeter : 0)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_start, "Start angle ()", "Start angle measured by a camera", Quantity.Pulses, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeStart * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_end, "End angle ()", "End angle measured by a camera", Quantity.Pulses, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeEnd * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state,           Strings.End_state,           Quantity.String,       ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.EndState)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses,              Strings.Pulses + "()",       Quantity.Pulses,       ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).IsPulses() ? w.GetMeterTestRslt(t).PulsesMeter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses_ni, Strings.RefPulses + "_ni()", Quantity.Pulses,       ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetMeterTestRslt(t).PulsesMaster)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_pulses,    Strings.RefPulses + "()",    Quantity.Pulses,       ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "F0", w.GetTestRslt(t).PulsesMaster)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle,        "Angle ()",       "Angle measured by a camera",       Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesMeter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_start, "Start angle ()", "Start angle measured by a camera", Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeStart * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Camera_angle_end, "End angle ()", "End angle measured by a camera", Quantity.Pulses, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u,f,p, "F0", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).VolumeEnd * w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_liter, Strings.PulsesLiter,        Quantity.PulsePerLtr, ItemCategory.MeterData, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulse__liter,     Strings.PulsesLiter + "()", Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? 0 : w.GetMeterTestRslt(t).PulsesPerLiter)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Degree__liter,    "Degree per liter ()",      Quantity.PulsePerLtr, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulses_per_liter, Strings.PulsesLiter,        Quantity.PulsePerLtr, ItemCategory.MeterData,  (w,t,u,f,p) => FormatDbl(u, f, p, "V4", w.WaterMeterData.PulsesPerLtr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Pulse__liter,     Strings.PulsesLiter + "()", Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? 0 : w.GetMeterTestRslt(t).PulsesPerLiter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Degree__liter,    "Degree per liter ()",      Quantity.PulsePerLtr, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).IsCamera() ? w.GetMeterTestRslt(t).PulsesPerLiter : 0)));
 
 			/// Water meters results (combined)
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main,     Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error) : string.Empty));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_aux,      Strings.Err_aux + "()",  Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_main, string.Format("{0} {1}", Strings.sn, Strings.main), Strings.Tooltip_sn_main, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_aux,  string.Format("{0} {1}", Strings.sn, Strings.aux),  Strings.Tooltip_sn_aux,  Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNrAux)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_main, Strings.EndState_main,   Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndState)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_aux,  Strings.EndState_aux,    Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.EndStateAux)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_main,     Strings.Err_main + "()", Quantity.Error, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) != null) ? FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain).Error) : string.Empty));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_aux,      Strings.Err_aux + "()",  Quantity.Error, ItemCategory.MeterResult, (w,t,u,f,p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) != null) ? FormatDbl(u, f, p, "V2",  w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux).Error) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_main, string.Format("{0} {1}", Strings.sn, Strings.main), Strings.Tooltip_sn_main, Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.SerialNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr_aux,  string.Format("{0} {1}", Strings.sn, Strings.aux),  Strings.Tooltip_sn_aux,  Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.SerialNrAux)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_main, Strings.EndState_main,   Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.EndState)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.End_state_aux,  Strings.EndState_aux,    Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.EndStateAux)));
 
             /// Batch info
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_ID,            Strings.Bench_ID,            Quantity.Number,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.TestBenchId.ToString())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_name,          Strings.Bench_name,          Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.TestBenchName) ? w.Batch.TestBenchName : "")));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address1,      Strings.Address + " 1",      Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address1) ? w.Batch.Address1 : "")));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address2,      Strings.Address + " 2",      Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address2) ? w.Batch.Address2 : "")));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address3,      Strings.Address + " 3",      Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address3) ? w.Batch.Address3 : "")));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address4,      Strings.Address + " 4",      Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address4) ? w.Batch.Address4 : "")));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address5,      Strings.Address + " 5",      Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address5) ? w.Batch.Address5 : "")));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Program_version,     Strings.Ver,                 Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.ProgramVersion)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.User_nr,             Strings.User_nr,             Quantity.Number,      ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.UserNumber)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.User_name,           Strings.User,                Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Common.Utils.EncodedStrToUserName(w.Batch.UserName))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.User_description,    Strings.User_description,    Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Common.Utils.EncodedStrToFullName(w.Batch.UserName))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Legalizator,         Strings.Legalizator,         Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, Common.Utils.EncodedStrToLegalizator(w.Batch.UserName))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeters,         Strings.WMs,                 Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.WatermetersStr)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_start_time,    Strings.Start,               Quantity.DateTime,    ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.StartTime.ToString() : string.Format(f, w.Batch.StartTime)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_end_time,      Strings.End,                 Quantity.DateTime,    ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read",        Quantity.PulsePerLtr, ItemCategory.Other, (w, t, u, f, p) => FormatDbl(u, f, p, "V4", (w.WaterMeterData.PulsesPerLtr != 0) ? 1/w.WaterMeterData.PulsesPerLtr : 0)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_meters_count, Strings.Passed_meters_count, Quantity.Number,      ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.PassedMetersCount())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Failed_meters_count, Strings.Failed_meters_count, Quantity.Number,      ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.FailedMetersCount())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_seals_count,  "Seals count of passed meters", Quantity.Number,   ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.PassedMetersCount() * int.Parse(w.WaterMeterData.Text5))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_ID,            Strings.Bench_ID,            Quantity.Number,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, w.Batch.TestBenchId.ToString())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_name,          Strings.Bench_name,          Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.TestBenchName) ? w.Batch.TestBenchName : "")));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address1,      Strings.Address + " 1",      Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address1) ? w.Batch.Address1 : "")));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address2,      Strings.Address + " 2",      Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address2) ? w.Batch.Address2 : "")));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address3,      Strings.Address + " 3",      Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address3) ? w.Batch.Address3 : "")));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address4,      Strings.Address + " 4",      Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address4) ? w.Batch.Address4 : "")));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Bench_address5,      Strings.Address + " 5",      Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, !string.IsNullOrEmpty(w.Batch.Address5) ? w.Batch.Address5 : "")));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Program_version,     Strings.Ver,                 Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, w.Batch.ProgramVersion)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.User_nr,             Strings.User_nr,             Quantity.Number,      ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.UserNumber)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.User_name,           Strings.User,                Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, Common.Utils.EncodedStrToUserName(w.Batch.UserName))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.User_description,    Strings.User_description,    Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, Common.Utils.EncodedStrToFullName(w.Batch.UserName))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Legalizator,         Strings.Legalizator,         Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, Common.Utils.EncodedStrToLegalizator(w.Batch.UserName))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Watermeters,         Strings.WMs,                 Quantity.String,      ItemCategory.Other, (w,t,u,f,p) => FormatStr(f, w.Batch.WatermetersStr)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_start_time,    Strings.Start,               Quantity.DateTime,    ItemCategory.Other, (w,t,u,f,p) => string.IsNullOrEmpty(f) ? w.Batch.StartTime.ToString() : string.Format(f, w.Batch.StartTime)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Batch_end_time,      Strings.End,                 Quantity.DateTime,    ItemCategory.Other, (w,t,u,f,p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Lite_per_pulse_Read, "1 / PlsPerLtr_Read",        Quantity.PulsePerLtr, ItemCategory.Other, (w,t,u,f,p) => FormatDbl(u, f, p, "V4", (w.WaterMeterData.PulsesPerLtr != 0) ? 1/w.WaterMeterData.PulsesPerLtr : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_meters_count, Strings.Passed_meters_count, Quantity.Number,      ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.PassedMetersCount())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Failed_meters_count, Strings.Failed_meters_count, Quantity.Number,      ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.FailedMetersCount())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_seals_count,  "Seals count of passed meters", Quantity.Number,   ItemCategory.Other, (w,t,u,f,p) => FormatInt(f, w.Batch.PassedMetersCount() * int.Parse(w.WaterMeterData.Text5))));
 
             /// Extra water meter data
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Result_code, Strings.Result_code,                                            Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ResultCode)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_remark,   string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark),  Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.Remark)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark,      string.Format("{0} {1}", Strings.Batch, Strings.Remark),        Quantity.String, ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, w.Batch.Remark)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type,  Strings.Meter_type,                                             Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_AssignedSerialNr, "Assigned s/n",                                       Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.AssignedSerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_CompleteSerialNr, "Complete s/n",                                       Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.CompleteSerialNr)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Result_code, Strings.Result_code,                                            Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.ResultCode)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_remark,   string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark),  Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.Remark)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark,      string.Format("{0} {1}", Strings.Batch, Strings.Remark),        Quantity.String, ItemCategory.TestResult,  (w,t,u,f,p) => FormatStr(f, w.Batch.Remark)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type,  Strings.Meter_type,                                             Quantity.String, ItemCategory.Other,       (w,t,u,f,p) => FormatStr(f, w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_AssignedSerialNr, "Assigned s/n",                                       Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.AssignedSerialNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_CompleteSerialNr, "Complete s/n",                                       Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.CompleteSerialNr)));
 
 #if HEAT_METERS
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,           Strings.Energy + " ()",       Quantity.Energy, ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_start,     Strings.Energy + " start ()", Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_end,       Strings.Energy + " end ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy).VolumeEnd) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy, Strings.Energy_ref + " ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy).VolumeRef) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,           Strings.Energy + " ()",       Quantity.Energy, ItemCategory.Other,	(w,t,u,f,p) => (w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy).VolumeMeter) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_start,     Strings.Energy + " start ()", Quantity.Energy, ItemCategory.Other, (w,t,u,f,p) => (w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy).VolumeStart) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_end,       Strings.Energy + " end ()",   Quantity.Energy, ItemCategory.Other, (w,t,u,f,p) => (w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy).VolumeEnd) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy, Strings.Energy_ref + " ()",   Quantity.Energy, ItemCategory.Other, (w,t,u,f,p) => (w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Common.CompoundMeterId.HeatMeterEnergy).VolumeRef) : string.Empty));
 #endif
 
 #if IPERL
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactor,   "iPerl OrigCalibFactor",   Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.OrigCalibFactor)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactor,       "iPerl CalibFactor",       Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.CalibFactor)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactorLNA,"iPerl OrigCalibFactorLNA",Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.OrigCalibFactorLNA)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactorLNA,    "iPerl CalibFactorLNA",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.CalibFactorLNA)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2ErrWOCorrection, "iPerl Q2ErrWOCorrection", Quantity.Error,  ItemCategory.MeterResult, (w, t, u, f, p) => FormatDbl(u, f, p, "V3", w.Q2ErrWOCorrection)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone,  "iPerl Q2CorrectionDone",  Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => (((w.Q2CorrRL != 0) || (w.Q2CorrLR != 0)) ? Strings.Yes : Strings.No)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow,       "iPerl Q2Corr RL",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRL)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow,       "iPerl Q2Corr LR",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLR)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight,   "iPerl Q2CorrFlowRight",   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrFlowRight)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.FW_Version,        "iPerl FW version",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.FWVersion)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactor,   "iPerl OrigCalibFactor",   Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatDbl(u, f, p, "V3", w.OrigCalibFactor)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactor,       "iPerl CalibFactor",       Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatDbl(u, f, p, "V3", w.CalibFactor)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.OrigCalibFactorLNA,"iPerl OrigCalibFactorLNA",Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatDbl(u, f, p, "V3", w.OrigCalibFactorLNA)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.CalibFactorLNA,    "iPerl CalibFactorLNA",    Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatDbl(u, f, p, "V3", w.CalibFactorLNA)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2ErrWOCorrection, "iPerl Q2ErrWOCorrection", Quantity.Error,  ItemCategory.MeterResult, (w,t,u,f,p) => FormatDbl(u, f, p, "V3", w.Q2ErrWOCorrection)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrectionDone,  "iPerl Q2CorrectionDone",  Quantity.Boolean,ItemCategory.MeterResult, (w,t,u,f,p) => (((w.Q2CorrRL != 0) || (w.Q2CorrLR != 0)) ? Strings.Yes : Strings.No)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow,       "iPerl Q2Corr RL",         Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.Q2CorrRL)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow,       "iPerl Q2Corr LR",         Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.Q2CorrLR)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight,   "iPerl Q2CorrFlowRight",   Quantity.Volume, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.Q2CorrFlowRight)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.FW_Version,        "iPerl FW version",        Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.FWVersion)));
   #if ORACLE_DB
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_test_index,    "iPerl test index",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, (w.Pruefindex % 100))));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OraWMTypeID,       "OraDB WM Type ID",        Quantity.Number, ItemCategory.MeterData,   (w, t, u, f, p) => FormatInt(f, w.WaterMeterData.WMTypeId)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.OraWMTypeRev,      "OraDB WM Type Rev.",      Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.WMTypeRevision)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Max_test_index,    "iPerl test index",        Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, (w.Pruefindex % 100))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.OraWMTypeID,       "OraDB WM Type ID",        Quantity.Number, ItemCategory.MeterData,   (w,t,u,f,p) => FormatInt(f, w.WaterMeterData.WMTypeId)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.OraWMTypeRev,      "OraDB WM Type Rev.",      Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.WMTypeRevision)));
   #endif
 #endif
 
 #if TURA_SPECIAL
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_RadioAddress,     "iPerl radio address",       Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_PaletteNr,        "iPerl palette nr.",         Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.PaletteNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_UmkartonNr,       "iPerl umkarton nr.",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.UmkartonNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_TestBench,        "Prod iPerl test bench",     Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ProdTestBench)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_WMPosition,       "Prod iPerl WM position",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdWMPosition)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_UserName,         "Prod iPerl user name",      Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ProdUserName)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_PurchaseOrder,    "Prod iPerl purchase order", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ProdPurchaseOrder)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Passed,           "Prod iPerl passed",         Quantity.Boolean,ItemCategory.MeterResult, (w, t, u, f, p) => FormatBool(f,w.ProdPassed)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_ResultCode,       "Prod iPerl result code",    Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdResultCode)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Q2CorrRL,         "Prod iPerl Q2Corr RL",      Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdQ2CorrRL)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Q2CorrLR,         "Prod iPerl Q2Corr LR",      Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ProdQ2CorrLR)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_RadioAddress,     "iPerl radio address",       Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.RadioAddress)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_PaletteNr,        "iPerl palette nr.",         Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.PaletteNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_UmkartonNr,       "iPerl umkarton nr.",        Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.UmkartonNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_TestBench,        "Prod iPerl test bench",     Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.ProdTestBench)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_WMPosition,       "Prod iPerl WM position",    Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.ProdWMPosition)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_UserName,         "Prod iPerl user name",      Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.ProdUserName)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_PurchaseOrder,    "Prod iPerl purchase order", Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.ProdPurchaseOrder)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Passed,           "Prod iPerl passed",         Quantity.Boolean,ItemCategory.MeterResult, (w,t,u,f,p) => FormatBool(f,w.ProdPassed)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_ResultCode,       "Prod iPerl result code",    Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.ProdResultCode)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Q2CorrRL,         "Prod iPerl Q2Corr RL",      Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.ProdQ2CorrRL)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_Q2CorrLR,         "Prod iPerl Q2Corr LR",      Quantity.Number, ItemCategory.MeterResult, (w,t,u,f,p) => FormatInt(f, w.ProdQ2CorrLR)));
 #endif
 
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone,     Strings.Test_done + "()",   Quantity.Boolean, ItemCategory.TestResult,  (w, t, u, f, p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).TestDone)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed,   Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult,  (w, t, u, f, p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).Passed)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlags,   Strings.Error_flags + "()", Quantity.String,  ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).ErrorFlagsStr() : w.ErrorFlagsStr())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlagsEx, Strings.Error_flags + "Ex", Quantity.String,  ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ErrorFlagsStrEx())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.InfoFlags,    Strings.Info_flags + "()",  Quantity.String,  ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).InfoFlagsStr() : w.InfoFlagsStr())));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E1, "E1 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E1) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E2, "E2 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E2) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E3, "E3 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E3) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E4, "E4 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E4) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E5, "E5 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E5) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E6, "E6 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E6) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E7, "E7 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E7) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E8, "E8 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E8) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E9, "E9 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E9) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E10, "E10 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E10) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E11, "E11 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E11) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E12, "E12 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E12) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E13, "E13 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E13) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E14, "E14 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E14) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E15) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E16, "E16 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E16) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E21, "E21 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E21) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E25, "E25 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E25) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E26, "E26 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E26) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E27, "E27 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E27) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.E28, "E28 ()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => ((w.ErrorFlags & (int)ErrorFlagMask.E28) != 0) ? Strings.Yes : Strings.No));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPartStr, "Test part str.", Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => FormatEnum(f, (w.GetMeterTestRslt(t) != null) ? w.GetMeterTestRslt(t).TestRslt.Part : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone,     Strings.Test_done + "()",   Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).TestDone)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed,   Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => FormatBool(f, (w.GetMeterTestRslt(t) != null) && w.GetMeterTestRslt(t).Passed)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlags,   Strings.Error_flags + "()", Quantity.String,  ItemCategory.TestResult,  (w,t,u,f,p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).ErrorFlagsStr() : w.ErrorFlagsStr())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlagsEx, Strings.Error_flags + "Ex", Quantity.String,  ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.ErrorFlagsStrEx())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.InfoFlags,    Strings.Info_flags + "()",  Quantity.String,  ItemCategory.TestResult,  (w,t,u,f,p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).InfoFlagsStr() : w.InfoFlagsStr())));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E1,  "E1 ()",  Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E1)  != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E2,  "E2 ()",  Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E2)  != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E3,  "E3 ()",  Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E3)  != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E4,  "E4 ()",  Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E4)  != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E5,  "E5 ()",  Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E5)  != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E6,  "E6 ()",  Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E6)  != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E7,  "E7 ()",  Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E7)  != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E8,  "E8 ()",  Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E8)  != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E9,  "E9 ()",  Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E9)  != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E10, "E10 ()", Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E10) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E11, "E11 ()", Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E11) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E12, "E12 ()", Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E12) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E13, "E13 ()", Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E13) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E14, "E14 ()", Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E14) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E15) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E16, "E16 ()", Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E16) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E21, "E21 ()", Quantity.Boolean, ItemCategory.TestResult,  (w,t,u,f,p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & (int)ErrorFlagMask.E21) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E25, "E25 ()", Quantity.Boolean, ItemCategory.MeterResult, (w,t,u,f,p) => ((w.ErrorFlags & (int)ErrorFlagMask.E25) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E26, "E26 ()", Quantity.Boolean, ItemCategory.MeterResult, (w,t,u,f,p) => ((w.ErrorFlags & (int)ErrorFlagMask.E26) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E27, "E27 ()", Quantity.Boolean, ItemCategory.MeterResult, (w,t,u,f,p) => ((w.ErrorFlags & (int)ErrorFlagMask.E27) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.E28, "E28 ()", Quantity.Boolean, ItemCategory.MeterResult, (w,t,u,f,p) => ((w.ErrorFlags & (int)ErrorFlagMask.E28) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPartStr, "Test part str.", Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => FormatEnum(f, (w.GetMeterTestRslt(t) != null) ? w.GetMeterTestRslt(t).TestRslt.Part : 0)));
 
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_row_nr, "Table row #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableRowNr.ToString() : string.Format(f, TableRowNr)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_column_nr, "Table column #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableColumnNr.ToString() : string.Format(f, TableColumnNr)));
-			AllItems.Add(new WMeterRsltItemSpec(ItemID.WMRemark, string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark), Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.Remark)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_row_nr, "Table row #", Quantity.Number, ItemCategory.Other, (w,t,u,f,p) => string.IsNullOrEmpty(f) ? TableRowNr.ToString() : string.Format(f, TableRowNr)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_column_nr, "Table column #", Quantity.Number, ItemCategory.Other, (w,t,u,f,p) => string.IsNullOrEmpty(f) ? TableColumnNr.ToString() : string.Format(f, TableColumnNr)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.WMRemark, string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark), Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.Remark)));
 
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter1,
                                                 string.Format(Strings.Counter_0, 1),
                                                 Quantity.Number,
                                                 ItemCategory.Other,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return (w.GetTestRslt(t) != null) ? FormatInt(f, w.GetTestRslt(t).Counter1) : string.Empty;
                                                 }));
@@ -510,7 +505,7 @@ namespace Results
                                                 string.Format(Strings.Counter_0, 2),
                                                 Quantity.Number,
                                                 ItemCategory.Other,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return (w.GetTestRslt(t) != null) ? FormatInt(f, w.GetTestRslt(t).Counter2) : string.Empty;
                                                 }));
@@ -519,7 +514,7 @@ namespace Results
                                                 string.Format(Strings.Counter_0, 3),
                                                 Quantity.Number,
                                                 ItemCategory.Other,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return (w.GetTestRslt(t) != null) ? FormatInt(f, w.GetTestRslt(t).Counter3) : string.Empty;
                                                 }));
@@ -528,7 +523,7 @@ namespace Results
                                                 string.Format(Strings.Counter_0, 4),
                                                 Quantity.Number,
                                                 ItemCategory.Other,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return (w.GetTestRslt(t) != null) ? FormatInt(f, w.GetTestRslt(t).Counter4) : string.Empty;
                                                 }));
@@ -537,7 +532,7 @@ namespace Results
                                                 string.Format(Strings.Counter_0, 5),
                                                 Quantity.Number,
                                                 ItemCategory.Other,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return (w.GetTestRslt(t) != null) ? FormatInt(f, w.GetTestRslt(t).Counter5) : string.Empty;
                                                 }));
@@ -546,7 +541,7 @@ namespace Results
                                                 string.Format(Strings.Counter_0, 6),
                                                 Quantity.Number,
                                                 ItemCategory.TestResult,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return FormatInt(f, w.Batch.Counter6);
                                                 }));
@@ -555,7 +550,7 @@ namespace Results
                                                 string.Format(Strings.Counter_0, 7),
                                                 Quantity.Number,
                                                 ItemCategory.TestResult,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return FormatInt(f, w.Batch.Counter7);
                                                 }));
@@ -564,7 +559,7 @@ namespace Results
                                                 string.Format(Strings.Counter_0, 8),
                                                 Quantity.Number,
                                                 ItemCategory.TestResult,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return FormatInt(f, w.Batch.Counter8);
                                                 }));
@@ -573,7 +568,7 @@ namespace Results
                                                 string.Format(Strings.Counter_0, 9),
                                                 Quantity.Number,
                                                 ItemCategory.TestResult,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return FormatInt(f, w.Batch.Counter9);
                                                 }));
@@ -582,7 +577,7 @@ namespace Results
                                                 string.Format(Strings.Counter_0, 10),
                                                 Quantity.Number,
                                                 ItemCategory.TestResult,
-                                                (w, t, u, f, p) =>
+                                                (w,t,u,f,p) =>
                                                 {
                                                     return FormatInt(f, w.Batch.Counter10);
                                                 }));

ResultsBrowser/Forms/PrinterConfigDlg.Designer.cs

@@ -107,6 +107,7 @@
             this.Controls.Add(this.printerClassComboBox);
             this.Name = "PrinterConfigDlg";
             this.Text = "Printer configuration";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PrinterConfigDlg_FormClosing);
             this.Load += new System.EventHandler(this.PrinterClassDlg_Load);
             this.ResumeLayout(false);
             this.PerformLayout();

ResultsBrowser/Forms/PrinterConfigDlg.cs

@@ -88,7 +88,7 @@ namespace ResultsBrowser.Forms
 				printerCfg = printerFactory.CmpntCfgFromCmpntEntity(cmpnt);
 			}
 
-            ComponentParametersDlg cfgForm = new ComponentParametersDlg();
+            ComponentParametersDlg cfgForm = new ComponentParametersDlg(this);
             cfgForm.CmpntEntities = new List<Component>();
 
             IComponentCfgCtrl cfgControl = printerCfg.GetControl(cfgForm.CmpntEntities);
@@ -167,5 +167,10 @@ namespace ResultsBrowser.Forms
 
             return null;
         }
+
+        private void PrinterConfigDlg_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            Common.CurrentUser.Restore(this);
+        }
     }
 }

S640TestApp/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>

S640TestApp/Program.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace S640TestApp
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new S640TestWnd());
+        }
+    }
+}

S640TestApp/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Events")]
+[assembly: AssemblyTitle("S640TestApp")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Events")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyProduct("S640TestApp")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3a68150f-6cfc-4f15-a813-cef63bc8bb47")]
+[assembly: Guid("2b84f803-89f3-43cd-9e2d-6ed03de6c3b8")]
 
 // Version information for an assembly consists of the following four values:
 //

S640TestApp/Properties/Resources.Designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace S640TestApp.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("S640TestApp.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}

S640TestApp/Properties/Resources.resx

@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,7 +60,6 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -69,10 +68,9 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -87,10 +85,9 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -112,9 +109,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

S640TestApp/Properties/Settings.Designer.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace S640TestApp.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}

S640TestApp/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

S640TestApp/S640TestApp.csproj

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{EE097B5A-8162-45B1-9643-4969FC3A8921}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>S640TestApp</RootNamespace>
+    <AssemblyName>S640TestApp</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="S640TestWnd.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="S640TestWnd.Designer.cs">
+      <DependentUpon>S640TestWnd.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="S640TestWnd.resx">
+      <DependentUpon>S640TestWnd.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Config\Config.csproj">
+      <Project>{743df7db-c7b6-42eb-986d-0f485e5588e4}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\RestClient\RestClient.csproj">
+      <Project>{46e3b0e1-209f-4550-b0dd-d7e2c039b3ce}</Project>
+      <Name>RestClient</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Results\Results.csproj">
+      <Project>{9d0dcc88-dc81-47eb-9fdd-4c3907871bfb}</Project>
+      <Name>Results</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TBF\TBF.csproj">
+      <Project>{8648fd92-cda1-4c3a-b5f9-fe547ce1fa48}</Project>
+      <Name>TBF</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>