Reconfigured for SENTEC

.gitignore

@@ -8,14 +8,12 @@ GemCard/bin
 GemCard/obj
 GraphLib/bin
 GraphLib/obj
-TracingDB/bin
-TracingDB/obj
+MonitoringDB/bin
+MonitoringDB/obj
 Results/bin/
 Results/obj/
 ResultsBrowser/bin/
 ResultsBrowser/obj/
-Statistics/bin/
-Statistics/obj/
 TBF/bin/
 TBF/obj/
 TBFSetup/Debug/

Config/Config.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SENTEC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;SENTEC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -78,7 +78,6 @@
     <Compile Include="Entities\IHasName.cs" />
     <Compile Include="Entities\IHasValves.cs" />
     <Compile Include="Entities\IParamsProvider.cs" />
-    <Compile Include="Entities\IperlEnums.cs" />
     <Compile Include="Entities\MeasurementCorrection.cs" />
     <Compile Include="Entities\MetersPath.cs" />
     <Compile Include="Entities\OutputPath.cs" />

Config/Data.cs

@@ -14,43 +14,25 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
-#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
+#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT
 		public const int WMsCount = 3;
 		public const int LineSize = 3;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || PUCHONG_200 || GENESIS || SLM_150 || PETERSBURG_200
+#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS || SLM_150 || PETERSBURG_200
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 3;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
-#elif DUBAJ_50
-		public const int WMsCount = 10;
-		public const int LineSize = 5;
-		public const int CompoundWMsCount = 0;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif IZRAEL_50
-		public const int WMsCount = 40;
-		public const int LineSize = 10;
-		public const int CompoundWMsCount = 0;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif FUZHOU_100
-		public const int WMsCount = 10;
-		public const int LineSize = 10;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif TORINO_50 || BADGER_MALA_TRAT || BERLIN
+#elif TORINO50 || BADGER_MALA_TRAT || BERLIN
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 1;
-#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50
+#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA
         public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;

Config/DatabaseSettings.cs

@@ -37,7 +37,7 @@ namespace Config
             result.IsRealBench  = IsRealBench;
 			result.ProceduresDBSettings = (Users.DBSettings)ProceduresDBSettings.Clone();
 			result.WaterMetersDBSettings = (Users.DBSettings)WaterMetersDBSettings.Clone();
-            result.UsersDBSettings = (Users.DBSettings)UsersDBSettings.Clone();
+			result.UsersDBSettings = (Users.DBSettings)ProceduresDBSettings.Clone();
 
             return result;
         }

Config/Entities/Enums.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -38,45 +38,7 @@ namespace Config.Entities
         }
     }
 
-    /// <summary>
-    /// Flags returned by each device configuration control Verify(...) function.
-    /// </summary>
-    public enum CfgUpdateFlags
-    {
-        None = 0,
-        Error = 0x1,			/// Some settings in the user control are invalid and cannot be set
-        Warning = 0x02,			/// Some settings in the user control are suspicious, can be set after user confirmation
-        RestartRqrd = 0x04,		/// TBF program restart is required to apply all changed parameters
-        AnyChange = 0x08,		/// At least one parameter have changed
-        VolatileChange = 0x10,
-        InvokeCfgChange = 0x20,	/// Invoke CfgChange handler of the component 
-    }
-
-    public enum RemoteDBUse
-    {
-        [Description("Local DB only")]          LocalDBOnly,
-        [Description("Remote DB only")]         RemoteDBOnly,
-        [Description("Both DB-s, local 1st")]   BothDBsLocalFirst,
-        [Description("Both DB-s, remote 1st")]  BothDBsRemoteFirst,
-        Count
-    }
-
-    /// <summary>
-    /// Contains a procedure name and a database specification (local/remote).
-    /// </summary>
-    public class ProcedureInfo
-    {
-        public readonly string Name;
-        public readonly Users.Entities.DBKind DBKind;
-
-        public ProcedureInfo(string name, Users.Entities.DBKind dbKind)
-        {
-            Name = name;
-            DBKind = dbKind;
-        }
-    }
-
-    public enum ProcedureState
+	public enum ProcedureState
 	{
 		Active,
 		History,
@@ -224,14 +186,6 @@ namespace Config.Entities
 		Count
 	}
 
-    public enum MeretProtocol
-    {
-        [Description("<undefined>")]        Undefined,
-        [Description("Meret (obsolete)")]   Meret,
-        [Description("Modbus")]             Modbus,
-        Count
-    }
-
 	public enum Publish : sbyte
 	{
 #if LANG_DE

Config/Entities/IParamsProvider.cs

@@ -1,8 +1,6 @@
 ///
 /// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
-using System;
-using System.Collections.Generic;
 using System.Xml.Serialization;
 
 namespace Config.Entities
@@ -22,19 +20,13 @@ namespace Config.Entities
 		int ParamsCount();
 
 		/// <summary>
-		/// Returns a parameter name
+		/// Parameter names
 		/// </summary>
 		/// <param name="ix">Zero based index of the parameter</param>
 		string ParamName(int ix);
 
-        /// <summary>
-        /// Returns a list of possible values of one parameter (ComboBox when editing) or null (Textbox when editing).
-        /// </summary>
-        /// <param name="ix">Zero based index of the parameter</param>
-        IList<string> ParamValues(int ix);
-
 		/// <summary>
-		/// Returns a parameter value in the string form
+		/// Parameter values in string form
 		/// </summary>
 		/// <param name="ix">Zero based index of the parameter</param>
 		string ToString(int ix);
@@ -58,13 +50,9 @@ namespace Config.Entities
 		/// </summary>
 		/// <param name="ix">Zero based index of the parameter</param>
 		/// <param name="strValue">String representation of the parameter</param>
-        CfgUpdateFlags UpdateParam(int ix, string strValue);
+		void UpdateParam(int ix, string strValue);
 
-        /// <summary>
-        /// Updates DB entities for related parameters
-        /// </summary>
-        /// <returns>true when successful</returns>
-        bool UpdateEmbeddedDbEntity();
+		void UpdateEmbeddedDbEntity();
 
         /// <summary>
         /// Creates an object copy

Config/Entities/IperlEnums.cs

@@ -1,44 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Config.Entities
-{
-
-    public enum Side
-    {
-#if LANG_CS
-        [Description("Levá")]   Left,
-        [Description("Pravá")]  Right,
-#else
-        [Description("Left")]   Left,
-        [Description("Right")]  Right,
-#endif
-        Count
-    }
-
-    public enum FlowDir
-    {
-        R_L,
-        L_R,
-        Count
-    }
-
-    public enum Counting
-    {
-        Arbitrary,
-        Positive,
-        Negative,
-        Count
-    }
-
-    public enum OptoHeadState
-    {
-        Disabled,
-        OptoAndDirOK,
-        OptoNok,
-        DirNok,
-        Count
-    }
-}

Config/Entities/MeasurementCorrection.cs

@@ -12,14 +12,11 @@ namespace Config.Entities
 		public virtual float Measurement { get; set; }
 		public virtual float Correction { get; set; }
 
-        public MeasurementCorrection()
-        {
-            RangeIx = 0; 
-        }
+        public MeasurementCorrection() { }
 
         public MeasurementCorrection(int rangeIx)
         {
-            RangeIx = rangeIx; 
+            RangeIx = rangeIx;
         }
 	}
 }

Config/Entities/Test.cs

@@ -25,8 +25,8 @@ namespace Config.Entities
 		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
         public virtual float TstTime { 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
+        public virtual float ErrLimLo { get; set; }			/// in [%] (usually < 0) or 1=class1, 2=class2, 3=class3
+        public virtual float ErrLimHi { get; set; }			/// in [%] (usually > 0) or -Qn in m3/h
         public virtual float Uncertainty { get; set; }		///	int [%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
         public virtual int Repeats { get; set; }
         public virtual bool DoDraining { get; set; }
@@ -310,88 +310,54 @@ namespace Config.Entities
             return null;
         }
 
-        public virtual double GetErrLimLo(double volumeCTV, double testTime)
+        public virtual float GetErrLimLo(float flow)
         {
             if (ErrLimLo <= ErrLimHi)
             {
-                return ErrLimLo;                        /// Error limit of a water meter
+                return ErrLimLo;        /// Error limit of a water meter
             }
             else
             {
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(ErrLimLo);
-                double Qp = Math.Abs(ErrLimHi);
-                double Q = (testTime == 0) ? 1 : Math.Max(3.6 * volumeCTV / testTime, 0.00001); /// Div. by zero avoided
+                float Qp = Math.Abs(ErrLimHi);
+                float Q = Math.Max(flow, 0.00001f);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
                 {
                     default:
-                    case 1: return -Math.Min(3.5, 1.0 + 0.01 * Qp / Q);
-                    case 2: return -Math.Min(5.0, 2.0 + 0.02 * Qp / Q);
-                    case 3: return -Math.Min(5.0, 3.0 + 0.05 * Qp / Q);
+                    case 1: return -Math.Min(3.5f, 1.0f + 0.01f * Qp / Q);
+                    case 2: return -Math.Min(5.0f, 2.0f + 0.02f * Qp / Q);
+                    case 3: return -Math.Min(5.0f, 3.0f + 0.05f * Qp / Q);
                 }
             }
         }
 
-        public virtual double GetErrLimHi(double volumeCTV, double testTime)
+        public virtual float GetErrLimHi(float flow)
         {
             if (ErrLimLo <= ErrLimHi)
             {
-                return ErrLimHi;                        /// Error limit of a water meter
+                return ErrLimHi;        /// Error limit of a water meter
             }
             else
             {
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(ErrLimLo);
-                double Qp = Math.Abs(ErrLimHi);
-                double Q = (testTime == 0) ? 1 : Math.Max(3.6 * volumeCTV / testTime, 0.00001); /// Div. by zero avoided
+                float Qp = Math.Abs(ErrLimHi);
+                float Q = Math.Max(flow, 0.00001f);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
                 {
                     default:
-                    case 1: return +Math.Min(3.5, 1.0 + 0.01 * Qp / Q);
-                    case 2: return +Math.Min(5.0, 2.0 + 0.02 * Qp / Q);
-                    case 3: return +Math.Min(5.0, 3.0 + 0.05 * Qp / Q);
+                    case 1: return +Math.Min(3.5f, 1.0f + 0.01f * Qp / Q);
+                    case 2: return +Math.Min(5.0f, 2.0f + 0.02f * Qp / Q);
+                    case 3: return +Math.Min(5.0f, 3.0f + 0.05f * Qp / Q);
                 }
             }
         }
 
-		public virtual bool IsPartCompatible(int waterMeterPartNr)
-		{
-			if ((this.Part == 0) || (waterMeterPartNr == 0)) return true;
-
-			if ((this.Part % 10) == waterMeterPartNr) return true;
-			if (((this.Part / 10) % 10) == waterMeterPartNr) return true;
-			if (((this.Part / 100) % 10) == waterMeterPartNr) return true;
-			if (((this.Part / 1000) % 10) == waterMeterPartNr) return true;
-
-			return false;
-		}
-
-		/// <summary>
-		/// Determines whether tests part number is OK.
-		/// Examples of correct part number are:
-		///	1, 2, 12, 21 in case of max. part nr.== 2
-		///	1, 2, 3, 4, 12, 13, 14, 23, 24, 34, 123, 124, 134, 234, 1234 in case of max. part nr.== 4
-		/// </summary>
-		/// <param name="partNr">Tests par tnumber</param>
-		/// <returns>true when Part number is OK</returns>
-		public static bool IsGoodPartNr(int partNr)
-		{
-			bool firstDigitIsOK  = ((partNr % 10) > 0) && ((partNr % 10) <= Config.Data.MaxPartNr);
-			bool secondDigitIsOK = (((partNr/10) % 10) > 0) && (((partNr/10) % 10) <= Config.Data.MaxPartNr);
-			bool thirdDigitIsOK  = (((partNr/100) % 10) > 0) && (((partNr/100) % 10) <= Config.Data.MaxPartNr);
-			bool fourthDigitIsOK = (((partNr/1000) % 10) > 0) && (((partNr/1000) % 10) <= Config.Data.MaxPartNr);
-
-			if (firstDigitIsOK && (partNr / 10 == 0)) return true;
-			if (firstDigitIsOK && secondDigitIsOK && (partNr / 100 == 0)) return true;
-			if (firstDigitIsOK && secondDigitIsOK && thirdDigitIsOK && (partNr / 1000 == 0)) return true;
-			if (firstDigitIsOK && secondDigitIsOK && thirdDigitIsOK && fourthDigitIsOK && (partNr / 10000 == 0)) return true;
-
-			return false;
-		}
 
 		public override string ToString()
 		{

Config/Entities/TransitionSequence.cs

@@ -1,10 +1,7 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
-using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 
 namespace Config.Entities
 {
@@ -40,56 +37,5 @@ namespace Config.Entities
 			foreach (var step in TransitionSteps) { result.TransitionSteps.Add(step.Clone()); }
             return result;
         }
-
-        public virtual void Export(StreamWriter output)
-        {
-            output.WriteLine(ItemNr.ToString(CultureInfo.InvariantCulture));
-            output.WriteLine(Name);
-            output.WriteLine(Description);
-
-            foreach (var step in TransitionSteps) { step.Export(output); }
-            output.WriteLine();
-
-            output.Close();
-        }
-
-        public static TransitionSequence Import(StreamReader input)
-        {
-            TransitionSequence result = new TransitionSequence();
-
-            result.ItemNr = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
-            result.Name = input.ReadLine();
-            result.Description = input.ReadLine();
-
-            while (true)
-            {
-                TransitionStep step = TransitionStep.Import(input, result);
-                if (step == null)
-                    break;
-                else
-                    result.TransitionSteps.Add(step);
-            }
-
-            return result;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            const string fmt = "{0} = {1}\r\n (in the file {2})\r\n";
-            string ln;
-
-            ln = inp.ReadLine();            /// skip ItemNr
-            ln = inp.ReadLine(); if (ln != Name) { diff.AppendFormat(fmt, "Name", Name, ln); };
-            ln = inp.ReadLine(); if (ln != Description) { diff.AppendFormat(fmt, "Description", Description, ln); };
-
-            //foreach (var step in TransitionSteps)
-            //{
-            //    string testDiff = step.Compare(inp);
-            //    if (testDiff.Contains(
-            //}
-
-            return diff.ToString();
-        }
-    }
+	}
 }

Config/Entities/TransitionStep.cs

@@ -1,10 +1,8 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015, 2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 
 namespace Config.Entities
 {
@@ -63,64 +61,5 @@ namespace Config.Entities
             result += indent + "PumpsWithFMPct = " + PumpWithFMPcts + Environment.NewLine;
             return result;
 		}
-
-        public virtual void Export(StreamWriter output)
-        {
-            CultureInfo ci = CultureInfo.InvariantCulture;
-
-            output.WriteLine(ItemNr.ToString(ci));
-            output.WriteLine(Duration.ToString(ci));
-            output.WriteLine(Message);
-            output.WriteLine(EndCondition);
-            output.WriteLine(ValvesOpen);
-            output.WriteLine(ValvesClose);
-            output.WriteLine(RegulValvesPct);
-            output.WriteLine(PumpWithFMPcts);
-        }
-
-        public static TransitionStep Import(StreamReader input, TransitionSequence newSequence)
-        {
-            string firstLine = input.ReadLine();
-            if (string.IsNullOrEmpty(firstLine))
-            {
-                return null;
-            }
-
-            CultureInfo ci = CultureInfo.InvariantCulture;
-            int itemNr = int.Parse(firstLine, ci);
-            TransitionStep tst = new TransitionStep(itemNr, newSequence);
-
-            tst.Duration = int.Parse(input.ReadLine(), ci);
-            tst.Message = input.ReadLine();
-            tst.EndCondition = input.ReadLine();
-            tst.ValvesOpen = input.ReadLine();
-            tst.ValvesClose = input.ReadLine();
-            tst.RegulValvesPct = input.ReadLine();
-            tst.PumpWithFMPcts = input.ReadLine();
-
-            return tst;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            string fmt = string.Format("Step {0} : ", ItemNr) + "{0} = {1}\r\n (in the file {2})\r\n";
-            string ln;
-            CultureInfo ci = CultureInfo.InvariantCulture;
-
-            string firstLine = inp.ReadLine();
-            if (string.IsNullOrEmpty(firstLine)) return string.Format("TransitionStep {0} is missing in the compared file\r\n", ItemNr);
-
-            if (ItemNr.ToString() != firstLine) { diff.AppendFormat(fmt, "ItemNr", ItemNr, firstLine); };
-            ln = inp.ReadLine(); if (ln != Duration.ToString(ci)) { diff.AppendFormat(fmt, "Duration", Duration.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != Message) { diff.AppendFormat(fmt, "Message", Message, ln); };
-            ln = inp.ReadLine(); if (ln != EndCondition) { diff.AppendFormat(fmt, "EndCondition", EndCondition, ln); };
-            ln = inp.ReadLine(); if (ln != ValvesOpen) { diff.AppendFormat(fmt, "ValvesOpen", ValvesOpen, ln); };
-            ln = inp.ReadLine(); if (ln != ValvesClose) { diff.AppendFormat(fmt, "ValvesClose", ValvesClose, ln); };
-            ln = inp.ReadLine(); if (ln != RegulValvesPct) { diff.AppendFormat(fmt, "RegulValvesPct", RegulValvesPct, ln); };
-            ln = inp.ReadLine(); if (ln != PumpWithFMPcts) { diff.AppendFormat(fmt, "PumpWithFMPcts", PumpWithFMPcts, ln); };
-
-            return diff.ToString();
-        }
 	}
 }

Config/Entities/VirtualBenchSequence.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace Config.Entities
 {
@@ -36,24 +35,5 @@ namespace Config.Entities
             foreach (var step in VirtualBenchSteps) { result.VirtualBenchSteps.Add(step.Clone()); }
             return result;
         }
-
-        public virtual void Export(StreamWriter output)
-        {
-            /// TODO
-        }
-
-        public static VirtualBenchSequence Import(StreamReader input)
-        {
-            VirtualBenchSequence result = new VirtualBenchSequence();
-            /// TODO
-            return result;
-        }
-
-        public virtual string Compare(StreamReader inp)
-        {
-            System.Text.StringBuilder diff = new System.Text.StringBuilder();
-            /// TODO
-            return diff.ToString();
-        }
     }
 }

Config/FluentCommon.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;
 using System.Windows.Forms;
@@ -39,11 +39,7 @@ namespace Config
 					dbType = Data.CurrentBench.WaterMetersDBSettings.DbType;
 					connectionString = Data.CurrentBench.WaterMetersDBSettings.ConnectionString;
                     break;
-                case Users.Entities.DBKind.RemoteConfig:
-                    dbType = Data.CurrentBench.UsersDBSettings.DbType;
-                    connectionString = Data.CurrentBench.UsersDBSettings.ConnectionString;
-                    break;
-            }
+			}
 
             return CreateSessionFactory(database, dbType, connectionString, false);
 		}
@@ -73,7 +69,6 @@ namespace Config
                 {
                     default:
 					case Users.Entities.DBKind.Config:
-                    case Users.Entities.DBKind.RemoteConfig:
                         cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
                     case Users.Entities.DBKind.Results:
@@ -127,6 +122,41 @@ namespace Config
 			return SessionFactories[ix].OpenSession();
 		}
 
+		public static void SaveToDb(Users.Entities.DBKind database, object obj)
+		{
+			SaveToDb(CreateSession(database), obj);
+		}
+
+		public static void SaveToDb(ISession session, object obj)
+		{
+            using (var transaction = session.BeginTransaction())
+            {
+                try
+				{
+					session.SaveOrUpdate(obj);
+					transaction.Commit();
+				}
+                catch
+				{
+					transaction.Rollback();
+				}
+            }
+        }
+
+		public static void DeleteFromDb(Users.Entities.DBKind database, object obj)
+		{
+			DeleteFromDb(CreateSession(database), obj);
+		}
+
+		public static void DeleteFromDb(ISession session, object obj)
+        {
+            using (var transaction = session.BeginTransaction())
+            {
+                session.Delete(obj);
+                transaction.Commit();
+            }
+        }
+
         /// <summary>
         /// Create an empty users database.
 		/// Database contains only the user 'admin' and the control board component 'CB'.
@@ -183,5 +213,30 @@ namespace Config
 
             return true;
         }
+
+        /// <summary>
+        /// Create an empty water meters database
+        /// </summary>
+        /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
+        /// <param name="connectionString">Connection string</param>
+        /// <returns>true=success, false=error</returns>
+		public static bool CreateEmptyResultsDB(Users.Entities.DBType dbType, string connectionString)
+        {
+			ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Results, dbType, connectionString, true);
+            if (sessionFactory == null) return false;
+
+            /// Populate the database
+            //using (var session = sessionFactory.OpenSession())
+            //{
+            //    using (var transaction = session.BeginTransaction())
+            //    {
+            //        /// Create one component
+            //        var cmpnt = (new BenchControl.Elde.ControlBoardCfg("CB", 1)).CreateDbEntity();
+            //        session.SaveOrUpdate(cmpnt);
+            //        transaction.Commit();
+            //    }
+            //}
+            return true;
+        }
     }
 }

Config/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("2.18.1122.0")]
-[assembly: AssemblyFileVersion("2.18.1122.0")]
+[assembly: AssemblyVersion("2.18.893.0")]
+[assembly: AssemblyFileVersion("2.18.893.0")]

Config/Utils.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,21 +9,7 @@ namespace Config
     {
         public static string SignificantDigitsToFmt(double value, int sigDigits)
         {
-            if (sigDigits == 6)
-            {
-                if (value >= 99999.5 || value < -99999.5) return "F0";
-                else if (value >= 9999.95 || value < -9999.95) return "F1";
-                else if (value >= 999.995 || value < -999.995) return "F2";
-                else if (value >= 99.9995 || value < -99.9995) return "F3";
-                else if (value >= 9.99995 || value < -9.99995) return "F4";
-                else if (value >= 0.999995 || value < -0.999995) return "F5";
-                else if (value >= 0.0999995 || value < -0.0999995) return "F6";
-                else if (value >= 0.00999995 || value < -0.00999995) return "F7";
-                else if (value >= 0.000999995 || value < -0.000999995) return "F8";
-                else if (value >= 0.0000999995 || value < -0.0000999995) return "F9";
-                else return "F10";
-            }
-            else if (sigDigits == 5)
+            if (sigDigits == 5)
             {
                 if (value >= 9999.5 || value < -9999.5) return "F0";
                 else if (value >= 999.95 || value < -999.95) return "F1";

DeviceTest/DeviceTestDlg.cs

@@ -56,10 +56,7 @@ namespace DeviceTest
 
 
 		static TBF.Boxes.FloatBox floatBox;
-        static TBF.Boxes.DoubleBox dblBox1;
-        static TBF.Boxes.DoubleBox dblBox2;
-        static TBF.Boxes.DoubleBox dblBox3;
-        static Event evnt;
+		static Event evnt;
 
 
 		static DeviceTestDlg()
@@ -660,12 +657,7 @@ namespace DeviceTest
 				operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
 				operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
-            {
-                operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
-            }
-            else if (tbfComponent1forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+			else if (tbfComponent1forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
 				//operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
 				//operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
@@ -689,15 +681,10 @@ namespace DeviceTest
 			}
 			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation21 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
-            {
-                operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
-            }
-            else if (tbfComponent2forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
 				//operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
                 //operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
@@ -721,15 +708,10 @@ namespace DeviceTest
 			}
 			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation31 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter)
-            {
-                operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadLevelOp(ref dblBox1);
-                operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.UltrasoundLevelMeter.LevelMeter).ReadTempOp(ref dblBox3);
-            }
-            else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
 			{
 				//operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
 				//operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
@@ -738,14 +720,11 @@ namespace DeviceTest
 			}
 
 
-            int time = 0;
-            while (workerThreadRunning)
+			while (workerThreadRunning)
 			{
 				Thread.Sleep(1000);
 
-                StateMachine.Time = ++time;
-
-                if (workerThreadRunning)
+				if (workerThreadRunning)
 				{
 					foreach (var d in tbfDevices) d.RunDeviceBefore();
 

DeviceTest/Program.cs

@@ -72,10 +72,10 @@ namespace DeviceTest
 			}
 
 			/// Configure and start logging
-			log4net.Config.XmlConfigurator.Configure(new System.IO.FileInfo(Path.Combine(LocAppDataDir, log4netConfigFName)));
+			log4net.Config.XmlConfigurator.Configure(new System.IO.FileInfo(LocAppDataDir + log4netConfigFName));
 			log = LogManager.GetLogger(typeof(Program));
 			log.Fatal("--------------------------------------------------------------------------------");
-			log.FatalFormat("DeviceTest ver.{0}", Version);
+			log.Fatal(string.Format("TBF ver.{0}", Version));
 
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);

GemCard/GemCard.csproj

@@ -121,6 +121,21 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
+    <COMReference Include="GemCardExLib">
+      <Guid>{F1FF634B-BEDF-461C-A409-5B88E05F5117}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+    <COMReference Include="SCARDSSPLib">
+      <Guid>{82C38704-19F1-11D3-A11F-00C04F79F800}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+    </COMReference>
     <COMReference Include="stdole">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>2</VersionMajor>

GraphLib/GraphLib.csproj

@@ -75,6 +75,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="PrecisionTimer.cs" />
     <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>

GraphLib/PlotterDisplayEx.cs

@@ -43,6 +43,11 @@ namespace GraphLib
         PlotterGraphSelectCurvesForm GraphPropertiesForm = null;
         PrintPreviewForm printPreviewForm = null;
 
+        private PrecisionTimer.Timer mTimer = null;
+        private float play_speed = 0.5f;
+        private float play_speed_max = 10f;
+        private float play_speed_min = 0.5f;
+
         private bool paused = false;
         private bool isRunning = false;
 
@@ -53,6 +58,11 @@ namespace GraphLib
         public PlotterDisplayEx()
         {
             InitializeComponent();
+            mTimer = new PrecisionTimer.Timer();
+            mTimer.Period = 50;                         // 20 fps
+            mTimer.Tick += new EventHandler(OnTimerTick);
+            play_speed = 0.5f; // 20x10 = 200 values per second == sample frequency     
+            mTimer.Start();
             isRunning = false;
         }
        
@@ -182,10 +192,85 @@ namespace GraphLib
 
         protected override void Dispose(bool disposing)
         {
-            paused = true;            
+            paused = true;
+
+            if (mTimer.IsRunning)
+            {
+                mTimer.Stop();
+                mTimer.Dispose();
+            }
+            
             base.Dispose(disposing);
         }
 
+        public void Start()
+        {
+            if (isRunning == false && paused == false)
+            {
+                gPane.starting_idx = 0;
+                paused = false;
+                isRunning = true;
+               // mTimer.Start();                
+                tb1.Buttons[0].ImageIndex = 2;                
+            }
+            else
+            {
+                if (paused == false)
+                {
+                    //mTimer.Stop();
+                    paused = true;
+                }
+                else
+                {
+                   // mTimer.Start();
+                    paused = false;
+                }
+
+                if (paused)
+                {
+                    
+                    tb1.Buttons[0].ImageIndex = 0;  
+                }
+                else
+                {
+                   
+                    tb1.Buttons[0].ImageIndex = 2;  
+                }
+            }
+        }
+
+        public void Stop()
+        {
+            if (isRunning)
+            {
+               // mTimer.Stop();
+                isRunning = false;
+                paused = false;
+                hScrollBar1.Value = 0;
+                tb1.Buttons[0].ImageIndex = 0;
+            }
+        }
+
+       
+        private void tb1_ButtonClick(object sender, ToolBarButtonClickEventArgs e)
+        {
+            bool pushed = e.Button.Pushed;
+            switch (e.Button.Tag.ToString().ToLower())
+            {
+                case "play":
+
+                    Start();
+                      
+                    break;
+
+                case "stop":
+
+                    Stop();
+                   
+                    break;       
+            }
+        }
+
         private void SetPlayPanelVisible()
         {
             panel1.Visible = true;          
@@ -232,6 +317,27 @@ namespace GraphLib
             {
             }
         }
+
+        private void UpdatePlayback()
+        {
+            if (!paused && isRunning == true)
+            {
+                try
+                {
+                    gPane.starting_idx += play_speed;
+                    UpdateScrollBar();
+                    gPane.Invalidate();
+                }
+                catch { }
+            }
+        }
+
+        private void OnTimerTick(object sender, EventArgs e)
+        {
+            UpdateControl();
+
+            UpdatePlayback();
+        }
         
         private void UpdateScrollBar()
         {

GraphLib/PlotterDisplayEx.designer.cs

@@ -57,6 +57,7 @@ namespace GraphLib
 			this.tb1.Size = new System.Drawing.Size(80, 26);
 			this.tb1.TabIndex = 1;
 			this.tb1.Visible = false;
+			this.tb1.ButtonClick += new System.Windows.Forms.ToolBarButtonClickEventHandler(this.tb1_ButtonClick);
 			// 
 			// tbbSave
 			// 

GraphLib/PrecisionTimer.cs

@@ -0,0 +1,490 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+#region License
+
+/*  
+ * Based on the work of  Leslie Sanford  
+ */
+
+#endregion
+
+
+namespace PrecisionTimer
+{    
+    public enum Mode
+    {        
+        OneShot,        
+        Periodic
+    };
+    
+    [StructLayout(LayoutKind.Sequential)]
+    public struct TimerCaps
+    {       
+        public int periodMin;       
+        public int periodMax;
+    }
+
+    
+    public sealed class Timer : IComponent
+    {       
+        private delegate void TimeProc(int id, int msg, int user, int param1, int param2);
+
+        private delegate void EventRaiser(EventArgs e);
+            
+        [DllImport("winmm.dll")]
+        private static extern int timeGetDevCaps(ref TimerCaps caps,
+                                                 int sizeOfTimerCaps);
+
+        [DllImport("winmm.dll")]
+        private static extern int timeSetEvent(int delay, 
+                                               int resolution,
+                                               TimeProc proc, 
+                                               int user, 
+                                               int mode);
+
+        [DllImport("winmm.dll")]
+        private static extern int timeKillEvent(int id);
+
+        private const int TIMERR_NOERROR = 0;
+        
+        private int timerID;
+
+        private volatile Mode mode;
+        
+        private volatile int period;
+
+        private volatile int resolution;        
+        
+        private TimeProc timeProcPeriodic;
+
+        private TimeProc timeProcOneShot;
+
+        private EventRaiser tickRaiser;
+
+        private bool running = false;
+
+        private volatile bool disposed = false;
+
+        private ISynchronizeInvoke synchronizingObject = null;
+
+        private ISite site = null;
+
+        private static TimerCaps caps;      
+         
+        public event EventHandler Started;
+         
+        public event EventHandler Stopped;
+         
+        public event EventHandler Tick;
+         
+        static Timer()
+        {
+            // Get multimedia timer capabilities.
+            timeGetDevCaps(ref caps, Marshal.SizeOf(caps));
+        }
+
+        
+        public Timer(IContainer container)
+        {
+            
+            container.Add(this);
+
+            Initialize();
+        }
+
+         
+        public Timer()
+        {
+            Initialize();
+        }
+
+        ~Timer()
+        {
+            if(IsRunning)
+            {
+                // Stop and destroy timer.
+                timeKillEvent(timerID);
+            }
+        }
+
+        private void Initialize()
+        {
+            this.mode = Mode.Periodic;
+            this.period = Capabilities.periodMin;
+            this.resolution = 1;
+
+            running = false;
+
+            timeProcPeriodic = new TimeProc(TimerPeriodicEventCallback);
+            timeProcOneShot = new TimeProc(TimerOneShotEventCallback);
+            tickRaiser = new EventRaiser(OnTick);
+        }
+
+        
+        public void Start()
+        {
+            
+            if(disposed)
+            {
+                throw new ObjectDisposedException("Timer");
+            }
+ 
+            if(IsRunning)
+            {
+                return;
+            }
+           
+            if(Mode == Mode.Periodic)
+            {
+                 timerID = timeSetEvent(Period, Resolution, timeProcPeriodic, 0, (int)Mode);
+            }
+            else
+            {
+                  timerID = timeSetEvent(Period, Resolution, timeProcOneShot, 0, (int)Mode);
+            }
+
+            if(timerID != 0)
+            {
+                running = true;
+
+                if(SynchronizingObject != null && SynchronizingObject.InvokeRequired)
+                {
+                    SynchronizingObject.BeginInvoke(
+                        new EventRaiser(OnStarted), 
+                        new object[] { EventArgs.Empty });
+                }
+                else
+                {
+                    OnStarted(EventArgs.Empty);
+                }                
+            }
+            else
+            {
+                throw new TimerException("Unable to start timer.");
+            }
+        }
+
+        
+        public void Stop()
+        {
+            
+            if(disposed)
+            {
+                throw new ObjectDisposedException("Timer");
+            }
+                        
+            if(!running)
+            {
+                return;
+            }
+
+                       
+            int result = timeKillEvent(timerID);
+
+            Debug.Assert(result == TIMERR_NOERROR);
+
+            running = false;
+
+            if(SynchronizingObject != null && SynchronizingObject.InvokeRequired)
+            {
+                SynchronizingObject.BeginInvoke(
+                    new EventRaiser(OnStopped), 
+                    new object[] { EventArgs.Empty });
+            }
+            else
+            {
+                OnStopped(EventArgs.Empty);
+            }
+        }        
+
+         
+        private void TimerPeriodicEventCallback(int id, int msg, int user, int param1, int param2)
+        {
+            if(synchronizingObject != null)
+            {
+                synchronizingObject.BeginInvoke(tickRaiser, new object[] { EventArgs.Empty });
+            }
+            else
+            {
+                OnTick(EventArgs.Empty);
+            }
+        }
+      
+        private void TimerOneShotEventCallback(int id, int msg, int user, int param1, int param2)
+        {
+            if(synchronizingObject != null)
+            {
+                synchronizingObject.BeginInvoke(tickRaiser, new object[] { EventArgs.Empty });
+                Stop();
+            }
+            else
+            {
+                OnTick(EventArgs.Empty);
+                Stop();
+            }
+        }
+
+        
+       
+        // Raises the Disposed event.
+        private void OnDisposed(EventArgs e)
+        {
+            EventHandler handler = Disposed;
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        // Raises the Started event.
+        private void OnStarted(EventArgs e)
+        {
+            EventHandler handler = Started;
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        // Raises the Stopped event.
+        private void OnStopped(EventArgs e)
+        {
+            EventHandler handler = Stopped;
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        // Raises the Tick event.
+        private void OnTick(EventArgs e)
+        {
+            EventHandler handler = Tick;
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+      
+       
+       
+
+        /// <summary>
+        /// Gets or sets the object used to marshal event-handler calls.
+        /// </summary>
+        public ISynchronizeInvoke SynchronizingObject
+        {
+            get
+            {
+                #region Require
+
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                #endregion
+
+                return synchronizingObject;
+            }
+            set
+            {
+                #region Require
+
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                #endregion
+
+                synchronizingObject = value;
+            }
+        }
+
+         
+        public int Period
+        {
+            get
+            {
+                #region Require
+
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                #endregion
+
+                return period;
+            }
+            set
+            {
+                #region Require
+
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+                else if(value < Capabilities.periodMin || value > Capabilities.periodMax)
+                {
+                    throw new ArgumentOutOfRangeException("Period", value,
+                        "Multimedia Timer period out of range.");
+                }
+
+                #endregion
+
+                period = value;
+
+                if(IsRunning)
+                {
+                    Stop();
+                    Start();
+                }
+            }
+        }
+
+       
+        public int Resolution
+        {
+            get
+            {
+                
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+                
+                return resolution;
+            }
+            set
+            {               
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+                else if(value < 0)
+                {
+                    throw new ArgumentOutOfRangeException("Resolution", value,
+                        "timer resolution out of range.");
+                }
+
+                resolution = value;
+
+                if(IsRunning)
+                {
+                    Stop();
+                    Start();
+                }
+            }
+        }
+        
+        public Mode Mode
+        {
+            get
+            {
+                
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                
+                return mode;
+            }
+            set
+            {
+               
+                if(disposed)
+                {
+                    throw new ObjectDisposedException("Timer");
+                }
+
+                 
+                mode = value;
+
+                if(IsRunning)
+                {
+                    Stop();
+                    Start();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the Timer is running.
+        /// </summary>
+        public bool IsRunning
+        {
+            get
+            {
+                return running;
+            }
+        }
+
+        /// <summary>
+        /// Gets the timer capabilities.
+        /// </summary>
+        public static TimerCaps Capabilities
+        {
+            get
+            {
+                return caps;
+            }
+        }
+
+      
+      
+      
+        public event System.EventHandler Disposed;
+
+        public ISite Site
+        {
+            get
+            {
+                return site;
+            }
+            set
+            {
+                site = value;
+            }
+        }
+
+       
+        public void Dispose()
+        {
+            
+            if(disposed)
+            {
+                return;
+            }
+            
+            if(IsRunning)
+            {
+                Stop();
+            }
+
+            disposed = true;
+
+            OnDisposed(EventArgs.Empty);
+        }
+
+        
+    }
+
+    
+    public class TimerException : ApplicationException
+    {       
+        public TimerException(string message) : base(message)
+        {
+        }
+    }
+}

MonitoringDB/Entities/Part.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace TracingDB.Entities
+namespace MonitoringDB.Entities
 {
     public class Part
     {
@@ -19,7 +19,7 @@ namespace TracingDB.Entities
 		public virtual Workstep Workstep { get; set; }
 
 
-		public Part()
+		protected Part()
 		{
             Name = string.Empty;
             Description = string.Empty;
@@ -53,21 +53,11 @@ namespace TracingDB.Entities
         /// <returns>Cloned part</returns>
 		public virtual Part Clone(Process owningProcess)
 		{
-			Part rslt = new Part();
-
-            rslt.Name = Name;
+			Part rslt = new Part(Name, owningProcess, CodeType, CodeForm, CodeLocation);
             rslt.OraDBType = OraDBType;
             rslt.Description = Description;
-            rslt.CodeType = CodeType;
-            rslt.CodeForm = CodeForm;
-            rslt.CodeLocation = CodeLocation;
 			rslt.LifetimeManagement = LifetimeManagement;
-
-            rslt.StepNumber = 0;
-            rslt.Process = owningProcess;
-            rslt.Workstep = null;
-
-            return rslt;
+			return rslt;
 		}
 
 		public override string ToString()

MonitoringDB/Entities/Process.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+
+namespace MonitoringDB.Entities
+{
+    public class Process
+    {
+        public virtual int Id { get; protected set; }
+        public virtual int ItemNr { get; set; }
+        public virtual string Name { get; set; }
+		public virtual string Description { get; set; }
+		public virtual ReleaseStatus ReleaseStatus { get; set; }
+		public virtual DateTime TimeStamp { get; set; }
+		public virtual string UserName { get; set; }
+
+		public virtual IList<Part> Parts { get; set; }
+		public virtual IList<Workstep> Worksteps { get; set; }
+
+		/// <summary>
+		/// Default (private) constructor inicializing lists
+		/// </summary>
+		protected Process()
+		{
+			Parts = new List<Part>();
+			Worksteps = new List<Workstep>();
+		}
+
+		/// <summary>
+		/// Constructor used when this process is created
+		/// </summary>
+		/// <param name="name"></param>
+		public Process(string name)
+			: this()
+		{
+			Name = name;
+			Description = string.Empty;
+			ReleaseStatus = ReleaseStatus.In_preparation;
+			TimeStamp = DateTime.Now;
+			UserName = "admin";
+		}
+
+        /// <summary>
+        /// Create a copy of a process with a new name
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+		public virtual Process Clone(string name)
+		{
+			Process rslt = new Process(name);
+			rslt.Description = Description;
+
+			foreach (var part in Parts) rslt.Parts.Add(part.Clone(rslt));
+			foreach (var workstep in Worksteps) rslt.Worksteps.Add(workstep.Clone(rslt));
+
+			return rslt;
+		}
+
+		public override string ToString()
+		{
+			return string.Format("{0} '{1}' ({2}) {3} {4}",
+								 ItemNr,
+								 Name,
+								 TimeStamp.Date.ToShortDateString(),
+								 (Description == null) ? string.Empty : Description,
+								 ReleaseStatus);
+		}
+    }
+}

MonitoringDB/Entities/Record.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace TracingDB.Entities
+namespace MonitoringDB.Entities
 {
     public class Record
     {

MonitoringDB/Entities/ReferenceRecord.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace TracingDB.Entities
+namespace MonitoringDB.Entities
 {
     public class ReferenceRecord
     {

MonitoringDB/Entities/Workstep.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace TracingDB.Entities
+namespace MonitoringDB.Entities
 {
     public class Workstep
     {

MonitoringDB/Enums.cs

@@ -0,0 +1,94 @@
+namespace MonitoringDB
+{
+    public enum CodeType
+    {
+        UniqueNr,
+        FlowtubeNr,                 /// prvé 3 znaky sa zhodujú s poslednými 3 znakmi názvu
+        FlowtubeNrLU,               /// začiatok kódu sa zhoduje s názvom
+        BatchNr,
+        BatchNrContainingPartName,
+        DateMMYY,
+		QualityCheck,
+    }
+
+    public enum CodeForm
+    {
+        Barcode,
+        QRCode,
+		Keyboard,
+		OkNok,
+    }
+
+	public enum CodeLocation
+	{
+		OnPart,
+		OnPallet,
+	}
+
+	public enum LifetimeManagement
+	{
+		None,
+		OneYear,
+		Count,
+	}
+
+	public enum ReleaseStatus
+	{
+		In_preparation,
+		Released,
+		ReleasedActive,
+		Deactivated,
+		Count,
+	}
+
+	public enum Mode
+	{
+		Debug,			// Debug mode - no Oracle database used
+		Test,			// Test database used
+		Production,		// Production database used
+		Count,
+	}
+
+    public enum LoginLevel
+    {
+        None,
+        TeamLeader,
+        Administrator,
+        MH,
+        Count,
+    }
+
+    public enum ItemSpecID
+    {
+        RefRecordID = 0,
+
+        TimeStamp,
+        Workstep,
+        Workplace,
+        UserName,
+        Barcode,
+        PartBarcode,
+
+        TimeStamp2,
+        Workstep2,
+        Workplace2,
+        UserName2,
+        Barcode2,
+        PartBarcode2,
+
+        SerialNr,
+        PurchaseOrder,
+        TestResult,
+        MaxPruefindex,
+        
+        Process,
+    }
+
+    public enum ItemSpecCaps
+    {
+        None = 0,
+        ReferenceRecord = 1,
+        AssociatedRecord = 2,
+        OracleQuery = 4,
+    }
+}

MonitoringDB/FluentNH.cs

@@ -5,20 +5,16 @@ using FluentNHibernate.Cfg.Db;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
-using log4net;
 
-namespace TracingDB
+namespace MonitoringDB
 {
-    public static class DB
+    public static class FluentNH
     {
-        static readonly ILog log = LogManager.GetLogger(typeof(DB));
-
-        /// <summary>
+		/// <summary>
 		/// Current session factory for the last used connection string or null
 		/// </summary>
 		public static ISessionFactory SessionFactory;
 
-        public static ISession Session;
 
         /// <summary> Connection string for all sessions </summary>
         static string connectionString;
@@ -114,7 +110,7 @@ namespace TracingDB
             {
 				//using (var transaction = session.BeginTransaction())
 				//{
-				//    var part1 = new TracingDB.Entities.Part("flow tube", CodeType.UniqueNr, CodeForm.QRCode, 0);
+				//    var part1 = new MonitoringDB.Entities.Part("flow tube", CodeType.UniqueNr, CodeForm.QRCode, 0);
 				//    session.SaveOrUpdate(part1);
 				//    transaction.Commit();
 				//}
@@ -124,7 +120,7 @@ namespace TracingDB
         }
 
 
-		public static IList<WMPart> FindWMParts(ISession session, string pcbNumber)
+		public static IList<WMPart> FindWMParts(string pcbNumber, string connString)
 		{
 			IList<WMPart> foundParts = new List<WMPart>();				/// initially empty
 
@@ -132,13 +128,15 @@ namespace TracingDB
 
 			try
 			{
-                /// Get all already existing reference records with Code == pcbNumber, referenceRecords[0] will be the most recent one
-                var referenceRecords = session.QueryOver<Entities.ReferenceRecord>()
-					                          .Where(rr => (rr.Code == pcbNumber))
-					                          .OrderBy(rr => rr.TimeStamp).Desc
-					                          .List();
+				ISession session = CreateSession(connString);
 
-				if (referenceRecords.Count == 0) return foundParts;     /// Returns an empty list if no such ref. record found
+				IList<Entities.ReferenceRecord> referenceRecords = session
+					.QueryOver<Entities.ReferenceRecord>()
+					.Where(x => (x.Code == pcbNumber))
+					.OrderBy(x => x.TimeStamp).Desc
+					.List<Entities.ReferenceRecord>();
+
+				if (referenceRecords.Count == 0) return foundParts;
 
 				foundParts.Add(new WMPart(referenceRecords[0]));
 				Entities.Process process = referenceRecords[0].Process;
@@ -210,84 +208,5 @@ namespace TracingDB
 				}
 			}
 		}
-
-        public static bool RegisterWorkplace(ISession session, string workplace, string user, string ipAddress, string processName, string workstepName, DateTime valiUntil)
-        {
-            try
-            {
-                IList<Entities.WorkplaceRegistration> wpRegs = session
-                    .QueryOver<Entities.WorkplaceRegistration>()
-                    .Where(x => (x.Workplace == workplace))
-                    .List();
-
-                if (wpRegs.Count == 0)
-                {
-                    Entities.WorkplaceRegistration wpReg = new Entities.WorkplaceRegistration(workplace, user, ipAddress, processName, workstepName);
-                    wpRegs.Add(wpReg);
-                    session.SaveOrUpdate(wpReg);
-                    log.InfoFormat("RegisterWorkplace(., {0}, {1}, ...) successful (new)", workplace, user);
-                    return true;
-                }
-                else if (wpRegs.Count == 1)
-                {
-                    Entities.WorkplaceRegistration wpReg = wpRegs[0];
-
-                    wpReg.Active = true;
-                    wpReg.TimeStamp = DateTime.Now;
-                    wpReg.ValidUntil = DateTime.Now + new TimeSpan(8, 0, 0);
-                    wpReg.UserName = user;
-                    wpReg.IPAddress = ipAddress;
-                    wpReg.ProcessName = processName;
-                    wpReg.WorkstepName = workstepName;
-
-                    session.SaveOrUpdate(wpReg);
-                    log.InfoFormat("RegisterWorkplace(., {0}, {1}, ...) successful", workplace, user);
-                    return true;
-                }
-                else
-                {
-                    log.ErrorFormat("RegisterWorkplace(., {0}, {1}, ...) failed", workplace, user);
-                    return false;
-                }
-            }
-            catch (Exception e)
-            {
-                log.ErrorFormat("RegisterWorkplace(., {0}, {1}, ...) exception: {2}", workplace, user, e.Message);
-                return false;
-            }
-        }
-
-        public static bool UnregisterWorkplace(ISession session, string workplace)
-        {
-            try
-            {
-                IList<Entities.WorkplaceRegistration> wpRegs = session
-                    .QueryOver<Entities.WorkplaceRegistration>()
-                    .Where(x => (x.Workplace == workplace))
-                    .List();
-
-                if (wpRegs.Count == 1)
-                {
-                    Entities.WorkplaceRegistration wpReg = wpRegs[0];
-
-                    wpReg.Active = false;
-                    wpReg.TimeStamp = DateTime.Now;
-
-                    session.SaveOrUpdate(wpReg);
-                    log.InfoFormat("UnregisterWorkplace(., {0}) successful", workplace);
-                    return true;
-                }
-                else
-                {
-                    log.ErrorFormat("UnregisterWorkplace(., {0}) failed", workplace);
-                    return false;
-                }
-            }
-            catch (Exception e)
-            {
-                log.ErrorFormat("UnregisterWorkplace(., {0}) exception: {1}", workplace, e.Message);
-                return false;
-            }
-        }
     }
 }

MonitoringDB/Forms/ListViewEx.cs

@@ -9,7 +9,7 @@ using System.Data;
 using System.Windows.Forms;
 using System.Runtime.InteropServices;
 
-namespace TracingDB.Forms
+namespace MonitoringDB.Forms
 {
 	/// <summary>
 	/// Event Handler for SubItem events

MonitoringDB/Forms/ModelessForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace TracingDB.Forms
+namespace MonitoringDB.Forms
 {
     partial class ModelessForm
     {

MonitoringDB/Forms/ModelessForm.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace TracingDB.Forms
+namespace MonitoringDB.Forms
 {
     public partial class ModelessForm : Form
     {

MonitoringDB/Forms/ResultsConfigDlg.cs

@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
-using TracingDB.Entities;
-using TracingDB.Resources;
+using MonitoringDB.Entities;
+using MonitoringDB.Resources;
 
-namespace TracingDB.Forms
+namespace MonitoringDB.Forms
 {
 	public partial class ResultsConfigDlg : Form
 	{

MonitoringDB/Forms/ResultsConfigDlg.designer.cs

@@ -1,7 +1,7 @@
 ///
 /// Copyright (c) 2016 Sensus Metering Systems
 ///
-namespace TracingDB.Forms
+namespace MonitoringDB.Forms
 {
 	partial class ResultsConfigDlg
 	{
@@ -39,7 +39,7 @@ namespace TracingDB.Forms
             this.removeAllButton = new System.Windows.Forms.Button();
             this.removeButton = new System.Windows.Forms.Button();
             this.addButton = new System.Windows.Forms.Button();
-            this.selectedResultsListViewEx = new TracingDB.Forms.ListViewEx();
+            this.selectedResultsListViewEx = new MonitoringDB.Forms.ListViewEx();
             this.upButton = new System.Windows.Forms.Button();
             this.downButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
@@ -133,8 +133,8 @@ namespace TracingDB.Forms
             this.selectedResultsListViewEx.TabIndex = 47;
             this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false;
             this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details;
-            this.selectedResultsListViewEx.SubItemClicked += new TracingDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked);
-            this.selectedResultsListViewEx.SubItemEndEditing += new TracingDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing);
+            this.selectedResultsListViewEx.SubItemClicked += new MonitoringDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked);
+            this.selectedResultsListViewEx.SubItemEndEditing += new MonitoringDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing);
             // 
             // upButton
             // 

MonitoringDB/Forms/SettingsDlg.Designer.cs

@@ -1,4 +1,4 @@
-namespace TracingDB.Forms
+namespace MonitoringDB.Forms
 {
 	partial class SettingsDlg
 	{
@@ -44,21 +44,12 @@
             this.oracleBatteryCheckBox = new System.Windows.Forms.CheckBox();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.usersDBConnStringTextBox = new System.Windows.Forms.TextBox();
-            this.timeGroupBox = new System.Windows.Forms.GroupBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.timePicker3 = new System.Windows.Forms.DateTimePicker();
-            this.timePicker2 = new System.Windows.Forms.DateTimePicker();
-            this.timePicker1 = new System.Windows.Forms.DateTimePicker();
-            this.processFilterGroupBox = new System.Windows.Forms.GroupBox();
-            this.processFilterComboBox = new System.Windows.Forms.ComboBox();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.oracleGroupBox.SuspendLayout();
             this.groupBox5.SuspendLayout();
-            this.timeGroupBox.SuspendLayout();
-            this.processFilterGroupBox.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBox1
@@ -84,7 +75,7 @@
             this.groupBox2.Controls.Add(this.radioButton1);
             this.groupBox2.Location = new System.Drawing.Point(12, 250);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(222, 70);
+            this.groupBox2.Size = new System.Drawing.Size(268, 70);
             this.groupBox2.TabIndex = 4;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Režim činnosti";
@@ -92,7 +83,7 @@
             // radioButton2
             // 
             this.radioButton2.AutoSize = true;
-            this.radioButton2.Location = new System.Drawing.Point(95, 41);
+            this.radioButton2.Location = new System.Drawing.Point(101, 41);
             this.radioButton2.Name = "radioButton2";
             this.radioButton2.Size = new System.Drawing.Size(58, 17);
             this.radioButton2.TabIndex = 1;
@@ -103,7 +94,7 @@
             // radioButton1
             // 
             this.radioButton1.AutoSize = true;
-            this.radioButton1.Location = new System.Drawing.Point(95, 20);
+            this.radioButton1.Location = new System.Drawing.Point(101, 20);
             this.radioButton1.Name = "radioButton1";
             this.radioButton1.Size = new System.Drawing.Size(46, 17);
             this.radioButton1.TabIndex = 0;
@@ -116,7 +107,7 @@
             this.groupBox3.Controls.Add(this.workplaceNameTextBox);
             this.groupBox3.Location = new System.Drawing.Point(12, 12);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(300, 50);
+            this.groupBox3.Size = new System.Drawing.Size(622, 50);
             this.groupBox3.TabIndex = 0;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "Meno pracoviska";
@@ -125,13 +116,13 @@
             // 
             this.workplaceNameTextBox.Location = new System.Drawing.Point(17, 18);
             this.workplaceNameTextBox.Name = "workplaceNameTextBox";
-            this.workplaceNameTextBox.Size = new System.Drawing.Size(265, 20);
+            this.workplaceNameTextBox.Size = new System.Drawing.Size(586, 20);
             this.workplaceNameTextBox.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(400, 270);
+            this.saveButton.Location = new System.Drawing.Point(348, 270);
             this.saveButton.Name = "saveButton";
             this.saveButton.Size = new System.Drawing.Size(104, 42);
             this.saveButton.TabIndex = 6;
@@ -142,7 +133,7 @@
             // 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(523, 270);
+            this.cancelButton.Location = new System.Drawing.Point(488, 270);
             this.cancelButton.Name = "cancelButton";
             this.cancelButton.Size = new System.Drawing.Size(104, 42);
             this.cancelButton.TabIndex = 7;
@@ -155,7 +146,7 @@
             this.groupBox4.Controls.Add(this.extraBatteryLifetimeTextBox);
             this.groupBox4.Location = new System.Drawing.Point(12, 182);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(222, 62);
+            this.groupBox4.Size = new System.Drawing.Size(268, 62);
             this.groupBox4.TabIndex = 3;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "Predĺženie životnosti baterky v mesiacoch";
@@ -164,16 +155,16 @@
             // 
             this.extraBatteryLifetimeTextBox.Location = new System.Drawing.Point(17, 25);
             this.extraBatteryLifetimeTextBox.Name = "extraBatteryLifetimeTextBox";
-            this.extraBatteryLifetimeTextBox.Size = new System.Drawing.Size(191, 20);
+            this.extraBatteryLifetimeTextBox.Size = new System.Drawing.Size(230, 20);
             this.extraBatteryLifetimeTextBox.TabIndex = 0;
             // 
             // oracleGroupBox
             // 
             this.oracleGroupBox.Controls.Add(this.checkPcbIsInOracleCheckBox);
             this.oracleGroupBox.Controls.Add(this.oracleBatteryCheckBox);
-            this.oracleGroupBox.Location = new System.Drawing.Point(384, 182);
+            this.oracleGroupBox.Location = new System.Drawing.Point(297, 182);
             this.oracleGroupBox.Name = "oracleGroupBox";
-            this.oracleGroupBox.Size = new System.Drawing.Size(249, 74);
+            this.oracleGroupBox.Size = new System.Drawing.Size(337, 74);
             this.oracleGroupBox.TabIndex = 5;
             this.oracleGroupBox.TabStop = false;
             this.oracleGroupBox.Text = "Oracle";
@@ -216,80 +207,11 @@
             this.usersDBConnStringTextBox.Size = new System.Drawing.Size(586, 20);
             this.usersDBConnStringTextBox.TabIndex = 0;
             // 
-            // timeGroupBox
-            // 
-            this.timeGroupBox.Controls.Add(this.label1);
-            this.timeGroupBox.Controls.Add(this.timePicker3);
-            this.timeGroupBox.Controls.Add(this.timePicker2);
-            this.timeGroupBox.Controls.Add(this.timePicker1);
-            this.timeGroupBox.Location = new System.Drawing.Point(240, 181);
-            this.timeGroupBox.Name = "timeGroupBox";
-            this.timeGroupBox.Size = new System.Drawing.Size(138, 140);
-            this.timeGroupBox.TabIndex = 8;
-            this.timeGroupBox.TabStop = false;
-            this.timeGroupBox.Text = "Čas odlogovania";
-            this.timeGroupBox.Visible = false;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(17, 27);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(106, 13);
-            this.label1.TabIndex = 3;
-            this.label1.Text = "00:00 = neodlogovať";
-            // 
-            // timePicker3
-            // 
-            this.timePicker3.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.timePicker3.Location = new System.Drawing.Point(19, 98);
-            this.timePicker3.Name = "timePicker3";
-            this.timePicker3.Size = new System.Drawing.Size(98, 20);
-            this.timePicker3.TabIndex = 2;
-            // 
-            // timePicker2
-            // 
-            this.timePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.timePicker2.Location = new System.Drawing.Point(19, 72);
-            this.timePicker2.Name = "timePicker2";
-            this.timePicker2.Size = new System.Drawing.Size(98, 20);
-            this.timePicker2.TabIndex = 1;
-            // 
-            // timePicker1
-            // 
-            this.timePicker1.AllowDrop = true;
-            this.timePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.timePicker1.Location = new System.Drawing.Point(19, 46);
-            this.timePicker1.Name = "timePicker1";
-            this.timePicker1.Size = new System.Drawing.Size(98, 20);
-            this.timePicker1.TabIndex = 0;
-            // 
-            // processFilterGroupBox
-            // 
-            this.processFilterGroupBox.Controls.Add(this.processFilterComboBox);
-            this.processFilterGroupBox.Location = new System.Drawing.Point(334, 12);
-            this.processFilterGroupBox.Name = "processFilterGroupBox";
-            this.processFilterGroupBox.Size = new System.Drawing.Size(300, 50);
-            this.processFilterGroupBox.TabIndex = 9;
-            this.processFilterGroupBox.TabStop = false;
-            this.processFilterGroupBox.Text = "Filter procesov";
-            this.processFilterGroupBox.Visible = false;
-            // 
-            // processFilterComboBox
-            // 
-            this.processFilterComboBox.FormattingEnabled = true;
-            this.processFilterComboBox.Location = new System.Drawing.Point(20, 17);
-            this.processFilterComboBox.Name = "processFilterComboBox";
-            this.processFilterComboBox.Size = new System.Drawing.Size(261, 21);
-            this.processFilterComboBox.TabIndex = 0;
-            // 
             // SettingsDlg
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(648, 333);
-            this.Controls.Add(this.processFilterGroupBox);
-            this.Controls.Add(this.timeGroupBox);
             this.Controls.Add(this.groupBox5);
             this.Controls.Add(this.oracleGroupBox);
             this.Controls.Add(this.groupBox4);
@@ -315,9 +237,6 @@
             this.oracleGroupBox.PerformLayout();
             this.groupBox5.ResumeLayout(false);
             this.groupBox5.PerformLayout();
-            this.timeGroupBox.ResumeLayout(false);
-            this.timeGroupBox.PerformLayout();
-            this.processFilterGroupBox.ResumeLayout(false);
             this.ResumeLayout(false);
 
 		}
@@ -340,12 +259,5 @@
         private System.Windows.Forms.CheckBox checkPcbIsInOracleCheckBox;
         private System.Windows.Forms.GroupBox groupBox5;
         private System.Windows.Forms.TextBox usersDBConnStringTextBox;
-        private System.Windows.Forms.GroupBox timeGroupBox;
-        private System.Windows.Forms.DateTimePicker timePicker3;
-        private System.Windows.Forms.DateTimePicker timePicker2;
-        private System.Windows.Forms.DateTimePicker timePicker1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.GroupBox processFilterGroupBox;
-        private System.Windows.Forms.ComboBox processFilterComboBox;
 	}
 }

MonitoringDB/Forms/SettingsDlg.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Windows.Forms;
+
+namespace MonitoringDB.Forms
+{
+	public partial class SettingsDlg : Form
+	{
+		public string WorkplaceName
+		{
+			set { workplaceNameTextBox.Text = value; }
+			get { return workplaceNameTextBox.Text; }
+		}
+
+		public string ConnectionString
+		{
+			set { connectionStringTextBox.Text = value; }
+			get { return connectionStringTextBox.Text; }
+		}
+
+        public string UsersDBConnString
+        {
+            set { usersDBConnStringTextBox.Text = value; }
+            get { return usersDBConnStringTextBox.Text; }
+        }
+
+        public bool OracleBattery
+        {
+            set { oracleBatteryCheckBox.Checked = value; }
+            get { return oracleBatteryCheckBox.Checked; }
+        }
+
+        public bool CheckPcbIsInOracle
+        {
+            set { checkPcbIsInOracleCheckBox.Checked = value; }
+            get { return checkPcbIsInOracleCheckBox.Checked; }
+        }
+
+        public int ExtraBatterLifetime
+        {
+            get
+            {
+                int extraLifetime;
+                if (int.TryParse(extraBatteryLifetimeTextBox.Text, out extraLifetime) && extraLifetime >= 0) return extraLifetime;
+                return 0;
+            }
+        }
+
+        public MonitoringDB.Mode Mode
+		{
+			set
+			{
+                radioButton1.Checked = (value == MonitoringDB.Mode.Test);
+                radioButton2.Checked = (value == MonitoringDB.Mode.Production);
+			}
+			get
+			{
+                return radioButton1.Checked ? MonitoringDB.Mode.Test : MonitoringDB.Mode.Production;
+			}
+		}
+
+        /// <summary>
+        /// Basic configuration dialog
+        /// </summary>
+        /// <param name="isWorkplace">false = Konfiguracia pracovisk, true = Pracovisko</param>
+		public SettingsDlg(bool isWorkplace)
+		{
+			InitializeComponent();
+            if (isWorkplace)
+            {
+                oracleGroupBox.Visible = true;
+            }
+            extraBatteryLifetimeTextBox.Text = "0";
+		}
+
+		private void saveButton_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.OK;
+			Close();
+		}
+
+		private void cancelButton_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+	}
+}

MonitoringDB/Forms/TrivialLoginDlg.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Windows.Forms;
+
+namespace MonitoringDB.Forms
+{
+	public partial class TrivialLoginDlg : Form
+	{
+        public LoginLevel LoginLevel;
+
+        public TrivialLoginDlg()
+		{
+			InitializeComponent();
+            LoginLevel = LoginLevel.None;
+		}
+
+		private void okButton_Click(object sender, EventArgs e)
+		{
+			if (passwordTextBox.Text.ToLower().Equals("barcode"))
+			{
+                LoginLevel = LoginLevel.Administrator;
+				DialogResult = DialogResult.OK;
+				Close();
+			}
+            else if (passwordTextBox.Text.ToLower().Equals("teamleader"))
+            {
+                LoginLevel = LoginLevel.TeamLeader;
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            else if (passwordTextBox.Text.ToLower().Equals("kremik"))
+            {
+                LoginLevel = LoginLevel.MH;
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            else
+			{
+				DialogResult = DialogResult.Cancel;
+				Close();
+			}
+		}
+
+		private void cancelButton_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+	}
+}

MonitoringDB/Forms/TrivialLoginDlg.designer.cs

@@ -0,0 +1,105 @@
+namespace MonitoringDB.Forms
+{
+	partial class TrivialLoginDlg
+	{
+		/// <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.passwordGroupBox = new System.Windows.Forms.GroupBox();
+			this.passwordTextBox = new System.Windows.Forms.TextBox();
+			this.okButton = new System.Windows.Forms.Button();
+			this.cancelButton = new System.Windows.Forms.Button();
+			this.passwordGroupBox.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// passwordGroupBox
+			// 
+			this.passwordGroupBox.Controls.Add(this.passwordTextBox);
+			this.passwordGroupBox.Location = new System.Drawing.Point(12, 10);
+			this.passwordGroupBox.Name = "passwordGroupBox";
+			this.passwordGroupBox.Size = new System.Drawing.Size(200, 49);
+			this.passwordGroupBox.TabIndex = 0;
+			this.passwordGroupBox.TabStop = false;
+			this.passwordGroupBox.Text = "Heslo";
+			// 
+			// passwordTextBox
+			// 
+			this.passwordTextBox.Location = new System.Drawing.Point(51, 18);
+			this.passwordTextBox.Name = "passwordTextBox";
+			this.passwordTextBox.PasswordChar = '*';
+			this.passwordTextBox.Size = new System.Drawing.Size(100, 20);
+			this.passwordTextBox.TabIndex = 0;
+			// 
+			// okButton
+			// 
+			this.okButton.Location = new System.Drawing.Point(237, 18);
+			this.okButton.Name = "okButton";
+			this.okButton.Size = new System.Drawing.Size(75, 39);
+			this.okButton.TabIndex = 1;
+			this.okButton.Text = "OK";
+			this.okButton.UseVisualStyleBackColor = true;
+			this.okButton.Click += new System.EventHandler(this.okButton_Click);
+			// 
+			// cancelButton
+			// 
+			this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancelButton.Location = new System.Drawing.Point(330, 18);
+			this.cancelButton.Name = "cancelButton";
+			this.cancelButton.Size = new System.Drawing.Size(75, 39);
+			this.cancelButton.TabIndex = 2;
+			this.cancelButton.Text = "Cancel";
+			this.cancelButton.UseVisualStyleBackColor = true;
+			this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+			// 
+			// LoginDlg
+			// 
+			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(426, 73);
+			this.Controls.Add(this.cancelButton);
+			this.Controls.Add(this.okButton);
+			this.Controls.Add(this.passwordGroupBox);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LoginDlg";
+			this.Text = "LoginDlg";
+			this.passwordGroupBox.ResumeLayout(false);
+			this.passwordGroupBox.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.GroupBox passwordGroupBox;
+		private System.Windows.Forms.TextBox passwordTextBox;
+		private System.Windows.Forms.Button okButton;
+		private System.Windows.Forms.Button cancelButton;
+	}
+}

MonitoringDB/ItemSpec.cs

@@ -3,12 +3,12 @@
 ///
 using System;
 using System.Collections.Generic;
-using TracingDB.Entities;
-using TracingDB.Resources;
+using MonitoringDB.Entities;
+using MonitoringDB.Resources;
 using NHibernate;
 using NHibernate.Criterion;
 
-namespace TracingDB
+namespace MonitoringDB
 {
 	public class ItemSpec
 	{
@@ -97,51 +97,25 @@ namespace TracingDB
             AllItems.Add(new ItemSpec(ItemSpecID.RefRecordID,   Strings.RefRecordID,    (x, f, p, w) => ((int)x).ToString(), ItemSpecCaps.ReferenceRecord));
             
             AllItems.Add(new ItemSpec(ItemSpecID.TimeStamp,     Strings.Time_stamp,     (x, f, p, w) => string.IsNullOrEmpty(f) ? ((DateTime)x).ToString() : string.Format(f, (DateTime)x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Workstep,      Strings.Workstep,       (x, f, p, w) => FormatStr(f, ((Workstep)x).Name), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Workplace,     Strings.Workplace,      (x, f, p, w) => FormatStr(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.UserName,      Strings.User_name,      (x, f, p, w) => FormatStr(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Barcode,       Strings.Barcode,        (x, f, p, w) => FormatStr(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.PartBarcode,   Strings.Part_barcode,   (x, f, p, w) => FormatStr(f, x), ItemSpecCaps.ReferenceRecord | ItemSpecCaps.AssociatedRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.Workstep,      Strings.Workstep,       (x, f, p, w) => string.IsNullOrEmpty(f) ? ((Workstep)x).Name : string.Format(f, ((Workstep)x).Name), ItemSpecCaps.ReferenceRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.Workplace,     Strings.Workplace,      (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.UserName,      Strings.User_name,      (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.Barcode,       Strings.Barcode,        (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.PartBarcode,   Strings.Part_barcode,   (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord | ItemSpecCaps.AssociatedRecord));
             
             AllItems.Add(new ItemSpec(ItemSpecID.TimeStamp2,    Strings.Time_stamp+"2", (x, f, p, w) => string.IsNullOrEmpty(f) ? ((DateTime)x).ToString() : string.Format(f, (DateTime)x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Workstep2,     Strings.Workstep + "2", (x, f, p, w) => FormatStr(f, ((Workstep)x).Name), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Workplace2,    Strings.Workplace + "2",(x, f, p, w) => FormatStr(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.UserName2,     Strings.User_name + "2",(x, f, p, w) => FormatStr(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.Barcode2,      Strings.Barcode + "2",  (x, f, p, w) => FormatStr(f, x), ItemSpecCaps.ReferenceRecord));
-            AllItems.Add(new ItemSpec(ItemSpecID.PartBarcode2,  Strings.Part_barcode + "2", (x, f, p, w) => FormatStr(f, x), ItemSpecCaps.ReferenceRecord | ItemSpecCaps.AssociatedRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.Workstep2,     Strings.Workstep+"2",   (x, f, p, w) => string.IsNullOrEmpty(f) ? ((Workstep)x).Name : string.Format(f, ((Workstep)x).Name), ItemSpecCaps.ReferenceRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.Workplace2,    Strings.Workplace+"2",  (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.UserName2,     Strings.User_name+"2",  (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.Barcode2,      Strings.Barcode+"2",    (x, f, p, w) => string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord));
+            AllItems.Add(new ItemSpec(ItemSpecID.PartBarcode2,  Strings.Part_barcode+"2",(x, f, p, w)=> string.IsNullOrEmpty(f) ? (string)x : string.Format(f, x), ItemSpecCaps.ReferenceRecord | ItemSpecCaps.AssociatedRecord));
             
             AllItems.Add(new ItemSpec(ItemSpecID.SerialNr,      Strings.Serial_nr,      (x, f, p, w) => x as string, ItemSpecCaps.ReferenceRecord | ItemSpecCaps.OracleQuery));
             AllItems.Add(new ItemSpec(ItemSpecID.PurchaseOrder, Strings.Purchase_order, (x, f, p, w) => x as string, ItemSpecCaps.ReferenceRecord | ItemSpecCaps.OracleQuery));
 			AllItems.Add(new ItemSpec(ItemSpecID.TestResult,	Strings.Test_result,	(x, f, p, w) => x as string, ItemSpecCaps.ReferenceRecord | ItemSpecCaps.OracleQuery));
             AllItems.Add(new ItemSpec(ItemSpecID.MaxPruefindex, Strings.Max_pruefindex, (x, f, p, w) => x as string, ItemSpecCaps.ReferenceRecord | ItemSpecCaps.OracleQuery));
-
-            AllItems.Add(new ItemSpec(ItemSpecID.Process,       Strings.Process,        (x, f, p, w) => FormatStr(f, ((Process)x).Name), ItemSpecCaps.ReferenceRecord));
-        }
-
-
-        public static string FormatStr(string format, object value)
-        {
-            int len;
-
-            if (string.IsNullOrEmpty(format))
-            {
-                return (string)value;
-            }
-            else if (int.TryParse(format, out len) && len > 0)
-            {
-                if (((string)value).Length >= len)
-                {
-                    return ((string)value).Substring(0, len);
-                }
-                else
-                {
-                    return (string)value;
-                }
-            }
-            else
-            {
-                return string.Format(format, value);
-            }
+            
+            AllItems.Add(new ItemSpec(ItemSpecID.Process,       Strings.Process,        (x, f, p, w) => string.IsNullOrEmpty(f) ? ((Process)x).Name : string.Format(f, ((Process)x).Name), ItemSpecCaps.ReferenceRecord));
         }
 
         public PropertyProjection GetProperty(ReferenceRecord refRecord, Record record)

MonitoringDB/Mappings/PartMap.cs

@@ -1,6 +1,6 @@
 using FluentNHibernate.Mapping;
 
-namespace TracingDB.Mappings
+namespace MonitoringDB.Mappings
 {
     class PartMap : ClassMap<Entities.Part>
     {

MonitoringDB/Mappings/ProcessMap.cs

@@ -0,0 +1,25 @@
+using FluentNHibernate.Mapping;
+
+namespace MonitoringDB.Mappings
+{
+    class ProcessMap : ClassMap<Entities.Process>
+    {
+        public ProcessMap()
+        {
+            Id(x => x.Id);
+            Map(x => x.ItemNr);
+            Map(x => x.Name);
+			Map(x => x.Description);
+			Map(x => x.ReleaseStatus);
+			Map(x => x.TimeStamp);
+			Map(x => x.UserName);
+
+			HasMany(x => x.Parts)
+				.OrderBy("Name")
+				.Cascade.All();
+			HasMany(x => x.Worksteps)
+				.OrderBy("WorkstepNr")
+				.Cascade.All();
+		}
+    }
+}

MonitoringDB/Mappings/RecordMap.cs

@@ -1,6 +1,6 @@
 using FluentNHibernate.Mapping;
 
-namespace TracingDB.Mappings
+namespace MonitoringDB.Mappings
 {
     class RecordMap : ClassMap<Entities.Record>
     {

MonitoringDB/Mappings/ReferenceRecordMap.cs

@@ -1,6 +1,6 @@
 using FluentNHibernate.Mapping;
 
-namespace TracingDB.Mappings
+namespace MonitoringDB.Mappings
 {
     class ReferenceRecordMap : ClassMap<Entities.ReferenceRecord>
     {

MonitoringDB/Mappings/WorkstepMap.cs

@@ -1,6 +1,6 @@
 using FluentNHibernate.Mapping;
 
-namespace TracingDB.Mappings
+namespace MonitoringDB.Mappings
 {
     class WorkstepMap : ClassMap<Entities.Workstep>
     {

MonitoringDB/MonitoringDB.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TracingDB</RootNamespace>
-    <AssemblyName>TracingDB</AssemblyName>
+    <RootNamespace>MonitoringDB</RootNamespace>
+    <AssemblyName>MonitoringDB</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -61,13 +61,15 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BatteryInfo.cs" />
-    <Compile Include="Entities\Option1.cs" />
-    <Compile Include="Entities\Option2.cs" />
-    <Compile Include="Entities\WorkplaceRegistration.cs" />
     <Compile Include="Forms\ListViewEx.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Forms\TrivialLoginDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\TrivialLoginDlg.designer.cs">
+      <DependentUpon>TrivialLoginDlg.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\ModelessForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -86,11 +88,7 @@
     <Compile Include="Forms\SettingsDlg.designer.cs">
       <DependentUpon>SettingsDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="Interfaces\IOption.cs" />
     <Compile Include="ItemSpec.cs" />
-    <Compile Include="Mappings\Option1Map.cs" />
-    <Compile Include="Mappings\Option2Map.cs" />
-    <Compile Include="Mappings\WorkplaceRegistrationMap.cs" />
     <Compile Include="QuitAppException.cs" />
     <Compile Include="Resources\Strings.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -106,7 +104,7 @@
     <Compile Include="Entities\ReferenceRecord.cs" />
     <Compile Include="Entities\Workstep.cs" />
     <Compile Include="Enums.cs" />
-    <Compile Include="DB.cs" />
+    <Compile Include="FluentNH.cs" />
     <Compile Include="Mappings\PartMap.cs" />
     <Compile Include="Mappings\ProcessMap.cs" />
     <Compile Include="Mappings\RecordMap.cs" />
@@ -123,6 +121,9 @@
     <EmbeddedResource Include="Forms\ListViewEx.resx">
       <DependentUpon>ListViewEx.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TrivialLoginDlg.resx">
+      <DependentUpon>TrivialLoginDlg.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\ModelessForm.resx">
       <DependentUpon>ModelessForm.cs</DependentUpon>
     </EmbeddedResource>

MonitoringDB/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Common")]
-[assembly: AssemblyCopyright("Copyright © 2015-2018 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright ©  2015-2017")]
 [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("2.0.65.0")]
-[assembly: AssemblyFileVersion("2.0.65.0")]
+[assembly: AssemblyVersion("1.5.57.0")]
+[assembly: AssemblyFileVersion("1.5.57.0")]

MonitoringDB/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Statistics.Properties {
+namespace MonitoringDB.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace Statistics.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Statistics.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MonitoringDB.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

MonitoringDB/QuitAppException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TracingDB
+namespace MonitoringDB
 {
     public class QuitAppException : Exception
     {

MonitoringDB/Resources/Strings.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace TracingDB.Resources {
+namespace MonitoringDB.Resources {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace TracingDB.Resources {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TracingDB.Resources.Strings", typeof(Strings).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MonitoringDB.Resources.Strings", typeof(Strings).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

MonitoringDB/ScanVerificationInfo.cs

@@ -1,6 +1,6 @@
-using TracingDB.Entities;
+using MonitoringDB.Entities;
 
-namespace TracingDB
+namespace MonitoringDB
 {
     public class ScanVerificationInfo
     {

MonitoringDB/SerializableDictionary.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace TracingDB
+namespace MonitoringDB
 {
     [XmlRoot("dictionary")]
     public class SerializableDictionary<TKey, TValue>

MonitoringDB/WMPart.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using TracingDB.Entities;
+using MonitoringDB.Entities;
 
-namespace TracingDB
+namespace MonitoringDB
 {
 	public class WMPart
 	{

Results/BatchResults.cs

@@ -27,8 +27,8 @@ namespace Results
 		public Batch Batch;
 		public WaterMeter[] WaterMeters;
 
-		public static BatchResults NewFromProcedure(int batchNr, int benchId, string benchName, string a1, string a2, string a3, string a4, string a5,
-                                                    string user, int userNr, string programVer, Config.Entities.Procedure procedure,
+		public static BatchResults NewFromProcedure(int batchNr, int benchId, string user, int userNr, string programVer,
+													Config.Entities.Procedure procedure,
 													WaterMeterData[] waterMeterDatas, int[] waterMeterParts, double densityCorr)
 		{
 			BatchResults d = new BatchResults(waterMeterDatas.Length);
@@ -37,14 +37,8 @@ namespace Results
 			/// Create new batch
 			d.Batch = new Batch()
 				{
-                    BatchNr = batchNr,
-                    TestBenchId = benchId,
-                    TestBenchName = benchName,
-					Address1 = a1,
-					Address2 = a2,
-					Address3 = a3,
-					Address4 = a4,
-					Address5 = a5,
+					TestBenchId = benchId,
+					BatchNr = batchNr,
 					ProgramVersion = programVer,
 					UserName = user,
 					UserNumber = userNr,
@@ -96,7 +90,7 @@ namespace Results
 						{
 							if (d.WaterMeters[i] == null) continue;
 
-							if (!t.IsPartCompatible(waterMeterParts[i])) continue;
+							if (t.Part != 0 && waterMeterParts[i] != 0 && t.Part != waterMeterParts[i]) continue;
 
 							///
 							/// Create empty watermeter test results and add them to the list and to dictionaries
@@ -205,10 +199,8 @@ namespace Results
                 {
                     foreach (var mtr in WaterMeters[i].MeterTestRslts)
                     {
-                        if (mtr.TestData().Name.ToLower().Contains("adj") || mtr.TestData().Name.ToLower().Contains("just"))
-                        {
+                        if (mtr.TestData().Name.ToLower().Contains("adj"))
                             return true;
-                        }
                     }
                 }
             }

Results/Entities/Batch.cs

@@ -11,13 +11,7 @@ namespace Results.Entities
 		public virtual int Id { get; protected set; }
 		public virtual int BatchNr { get; set; }
 		public virtual int TestBenchId { get; set; }
-        public virtual string TestBenchName { get; set; }	        /// CEVAK, not mapped to DB
-        public virtual string Address1 { get; set; }	            /// CEVAK, not mapped to DB
-        public virtual string Address2 { get; set; }	            /// CEVAK, not mapped to DB
-        public virtual string Address3 { get; set; }	            /// CEVAK, not mapped to DB
-        public virtual string Address4 { get; set; }	            /// CEVAK, not mapped to DB
-        public virtual string Address5 { get; set; }	            /// CEVAK, not mapped to DB
-        public virtual string ProgramVersion { get; set; }
+		public virtual string ProgramVersion { get; set; }
 		public virtual string UserName { get; set; }
 		public virtual int UserNumber { get; set; }
 		public virtual string ProcedureName { get; set; }

Results/Entities/MeterTestRslt.cs

@@ -28,9 +28,6 @@ namespace Results.Entities
         public virtual double KorrErrQ        { get; set; }     /// [%] not mapped to results DB, saved to Oracle DB
 		public virtual bool   TestDone		  { get; set; }		/// true = test was completed
 		public virtual bool   Passed		  { get; set; }		/// true = test passed, water meter is OK
-#if ORACLE_DB
-        public virtual double LastError       { get; set; }     /// [%] Previous test error at this Q in case Pruefindex > 1
-#endif
 
         public virtual WaterMeter WaterMeter  { get; set; }		/// reference to the WaterMeter entity
         public virtual TestRslt TestRslt      { get; set; }		/// reference to the TestRslt entity
@@ -83,18 +80,10 @@ namespace Results.Entities
         public virtual bool IsDataStream() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.DataStream); }
         public virtual bool IsManual() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.Manual); }
 
-        public virtual string PassedColorStr(string yesNoFormatOrEmpty)
+		public virtual string PassedColorStr()
         {
-            if (string.IsNullOrEmpty(yesNoFormatOrEmpty))
-            {
-                return Utils.PassedColorStr(Passed, Evaluate());
-            }
-            else
-            {
-                string[] yesNo = yesNoFormatOrEmpty.Split(new char[] { '~' });
-                return Passed ? yesNo[0] : ((yesNo.Length >= 2) ? yesNo[1] : Results.Resources.Strings.No);
-            }
-        }
+            return Utils.PassedColorStr(Passed, Evaluate());
+		}
 
         public MeterTestRslt()
         {

Results/Entities/TestData.cs

@@ -20,8 +20,8 @@ namespace Results.Entities
 		public virtual double TargetVolume			{ get; set; }	/// [l] target test volume
 		public virtual double TargetTime			{ get; set; }	/// [s] target test time
 		public virtual string Method				{ get; set; }
-        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 ErrLimLo				{ get; set; }	/// [%] (usually < 0)
+		public virtual double ErrLimHi				{ get; set; }	/// [%] (usually > 0)
 		public virtual double Uncertainty			{ get; set; }	///	[%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
 		public virtual bool   DoControlWaterTemp	{ get; set; }
 		public virtual float  TempLimLo				{ get; set; }

Results/Entities/TestRslt.cs

@@ -25,12 +25,9 @@ namespace Results.Entities
 		public virtual DateTime EndTime { get; set; }       /// Date and time of the test end
 		public virtual int FlowSetTime { get; set; }        /// [s]     Measurement time in seconds
 		public virtual double TestTime { get; set; }        /// [s]     Measurement time in seconds
-		public virtual double PulsesMaster { get; set; }    /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the water to the tank 
-        public virtual double TotalPulsesMstr { get; set; } /// [pls]   FlyingStartMassCollectionProlonged: MID pulses of the complete test (not mapped to DB)
-        public virtual double ConstMasterRaw { get; set; }  /// [l/pls] Liters per pulse of the master flow meter uncorrected.
-        public virtual double ConstMasterCorr { get; set; } /// [l/pls] Liters per pulse of the master flow meter corrected by a correction table.
-        public virtual double ConstMaster { get; set; }     /// [l/pls] Liters per pulse of the master flow meter calculated from a mass measurement.
-                                                            ///         When mass measurement is not available, corrected by a correction table.
+		public virtual double PulsesMaster { get; set; }
+        public virtual double ConstMasterRaw { get; set; }  /// [l/pls] Liters per pulse of the master flow meter uncorrected
+        public virtual double ConstMaster { get; set; }     /// [l/pls] Liters per pulse of the master flow meter
         public virtual double MassStartRaw { get; set; }	/// [kg]
 		public virtual double MassStart { get; set; }		/// [kg]
 		public virtual double MassEndRaw { get; set; }		/// [kg]
@@ -43,7 +40,7 @@ namespace Results.Entities
 		public virtual double FlowVolume { get; set; }		/// [m3/h]
 		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
+		public virtual double ErrorMaster { get; set; }		/// [%]
 
         public virtual float  DiverterStart { get; set; }   /// [s]    Diverter switch time when test starts
         public virtual float  DivStart10 { get; set; }      /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
@@ -110,7 +107,7 @@ namespace Results.Entities
 		public virtual float FlowMean { get; set; }			/// [m3/h] mean flow from the reference flowmeter
 		public virtual float FlowStart { get; set; }		/// [m3/h] flow at the start of test from the reference flowmeter
 		public virtual float FlowEnd { get; set; }			/// [m3/h] flow at the end of test from the reference flowmeter
-        public virtual float FlowMin { get; set; }			/// [m3/h]
+        public virtual float FlowMin { get; set; }			/// [m3/h] not mapped to DB
         public virtual float FlowMax { get; set; }			/// [m3/h] 
 
         public virtual float Custom1  { get; set; }			/// [°C] T ref hi mean
@@ -132,10 +129,9 @@ namespace Results.Entities
 		public virtual double TargetVolume() { return TestData.TargetVolume; }
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
-        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection")) : true; }
-        public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest")) : true; }
-        public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; }
-        public virtual bool IsDiverter()     { return (MethodClass != null) ? (MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) : true; }
+        public virtual bool IsPMaxTest()     { return (MethodClass != null) && (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest")); }
+        public virtual bool IsStartStop()    { return (MethodClass != null) && MethodClass.Contains("FixedStart"); }
+        public virtual bool IsDiverter()     { return (MethodClass != null) && MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl"); }
 
 		public virtual double ErrLimLo()
         {
@@ -148,7 +144,7 @@ namespace Results.Entities
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(TestData.ErrLimLo);
                 double Qp = Math.Abs(TestData.ErrLimHi);
-                double Q = (TestTime == 0) ? 1 : Math.Max(3.6 * VolumeCTV / TestTime, 0.00001); /// Div. by zero avoided
+                double Q = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
@@ -172,7 +168,7 @@ namespace Results.Entities
                 /// Metrological class and nominal flow of a heat meter
                 int metrClass = (int)Math.Round(TestData.ErrLimLo);
                 double Qp = Math.Abs(TestData.ErrLimHi);
-                double Q = (TestTime == 0) ? 1 : Math.Max(3.6 * VolumeCTV / TestTime, 0.00001); /// Div. by zero avoided
+                double Q = Math.Max(FlowMean, 0.00001);     /// to avoid division by zero
 
                 /// Calculate the error limit of a heat meter
                 switch (metrClass)
@@ -319,18 +315,6 @@ namespace Results.Entities
 #endif
         }
 
-		public virtual bool IsPartCompatible(int waterMeterPartNr)
-		{
-			if ((this.Part == 0) || (waterMeterPartNr == 0)) return true;
-
-			if ((this.Part % 10) == waterMeterPartNr) return true;
-			if (((this.Part / 10) % 10) == waterMeterPartNr) return true;
-			if (((this.Part / 100) % 10) == waterMeterPartNr) return true;
-			if (((this.Part / 1000) % 10) == waterMeterPartNr) return true;
-
-			return false;
-		}
-
         public override string ToString()
         {
 			return string.Format("batch={0}, procedure={1}, test={2}, {3} {4}", Batch.BatchNr, Batch.ProcedureName, Name(), StartTime.ToShortDateString(), StartTime.ToShortTimeString());

Results/Entities/WaterMeter.cs

@@ -41,8 +41,8 @@ namespace Results.Entities
     public class WaterMeter
 	{
 		public virtual int    Id				{ get; protected set; }
-        public virtual string SerialNr          { get; set; }	/// S/N _or_ S/N of the main meter of a compound meter _or_ PCB Number of an iPerl water meter
-        public virtual string SerialNrAux       { get; set; }	/// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter
+		public virtual string SerialNr			{ get; set; }	/// Main s/n for compound meters, PCB Number for iPerl water meter
+		public virtual string SerialNrAux		{ get; set; }	/// Aux s/n for compound meters, Serial number for iPerl water meter
 		public virtual string PurchaseOrder		{ get; set; }
 		public virtual int    YearOfProduction  { get; set; }
 		public virtual int    WMPosition        { get; set; }
@@ -57,44 +57,23 @@ namespace Results.Entities
 		public virtual string Remark			{ get; set; }
 
 #if IPERL
-		public virtual double OrigCalibFactor   { get; set; }	/// Original iPerl calibration factor used during the test
-        public virtual double CalibFactor       { get; set; }	/// iPerl calibration factor used during the test
-        public virtual double OrigCalibFactorLNA{ get; set; }	/// Original iPerl LNA calibration factor used during the test
-        public virtual double CalibFactorLNA    { get; set; }	/// iPerl LNA calibration factor used during the test
-        public virtual double Q2ErrWOCorrection { get; set; }
+		public virtual int    SerialNrEx        { get; set; }	/// Aux s/n for compound meters, Serial number for iPerl water meter
+		public virtual double OrigCalibFactor   { get; set; }	/// iPerl calibration factor used during the test
+		public virtual double CalibFactor		{ get; set; }	/// iPerl calibration factor used during the test
+		public virtual double Q2ErrWOCorrection { get; set; }
 		public virtual bool   Q2CorrectionDone  { get; set; }   /// true = iPerl Q2 correction was done
         public virtual double Q2Correction      { get; set; }	/// !!! obsolete
-        public virtual int    Q2CorrRL          { get; set; }	/// iPerl Q2 correction for the R-flow written to iPerl
-        public virtual int    Q2CorrLR          { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
+        public virtual int    Q2CorrRFlow       { get; set; }	/// iPerl Q2 correction for the R-flow written to iPerl
+        public virtual int    Q2CorrLFlow       { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
         public virtual int    Q2CorrFlowRight   { get; set; }	/// 1 = right to left
 		public virtual double Diff2Hz8Hz		{ get; set; }
 		public virtual bool   Hz2CorrectionDone { get; set; }   /// true = iPerl Q2 correction was done
 		public virtual int    Hz2Correction     { get; set; }	/// iPerl Q2 correction used during the test
 		public virtual string FWVersion         { get; set; }
 #endif
-#if TURA_SPECIAL
-        /// <summary>
-        /// Data from a production test bench (in case of tests on iPerl special)
-        /// </summary>
-        public virtual int    AssignedSerialNr  { get; set; }
-        public virtual string CompleteSerialNr  { get; set; }
-        public virtual string RadioAddress      { get; set; }
-        public virtual int    PaletteNr         { get; set; }
-        public virtual int    UmkartonNr        { get; set; }
-        public virtual string ProdTestBench     { get; set; }
-        public virtual int    ProdWMPosition    { get; set; }
-        public virtual string ProdUserName      { get; set; }
-        public virtual string ProdPurchaseOrder { get; set; }
-        public virtual bool   ProdPassed        { get; set; }
-        public virtual int    ProdResultCode    { get; set; }
-        public virtual int    ProdQ2CorrRL      { get; set; }	/// iPerl Q2 correction for the R-flow written to iPerl
-        public virtual int    ProdQ2CorrLR      { get; set; }	/// iPerl Q2 correction for the L-flow written to iPerl
-#endif
 #if ORACLE_DB
 		public virtual int	  Pruefindex	    { get; set; }	/// Not mapped to DB !!! 0=unknown (saving to Oracle failed), >=1 ... pruefindex
 		public virtual int	  HydrPruefung		{ get; set; }	/// Not mapped to DB !!!
-        public virtual int    WMTypeRevision    { get; set; }	/// Not mapped to DB !!!
-        public virtual object TestInfos         { get; set; }	/// SensusTestInfo[] array fetched at the beginning of the cycle, not mapped to DB !!!
 #endif
 		public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
@@ -138,7 +117,7 @@ namespace Results.Entities
             ErrorFlagsMode eFlagsMode = 0;  /// = ErrorFlagsMode.Off;
             foreach (var mtr in MeterTestRslts)
             {
-                if (mtr.Evaluate() && mtr.TestDone) errorFlags |= mtr.TestRslt.ErrorFlags;
+                if (mtr.TestDone) errorFlags |= mtr.TestRslt.ErrorFlags;
                 if ((int)mtr.TestRslt.ErrorFlagsMode() > (int)eFlagsMode) eFlagsMode = mtr.TestRslt.ErrorFlagsMode();
             }
             errorFlagsMode = eFlagsMode;    /// Maximum from all tests (=ErrorFlagsMode.On if at least one test is ErrorFlagsMode.On)
@@ -170,7 +149,7 @@ namespace Results.Entities
         {
             ErrorFlagsMode errorFlagsMode;
             string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode));
-            return string.IsNullOrEmpty(eFlags) ? (WaterMeterData.Text4 + PassedColorStr(null)) : eFlags;
+            return string.IsNullOrEmpty(eFlags) ? (WaterMeterData.Text4 + PassedColorStr()) : eFlags;
         }
 
         /// <summary>
@@ -230,17 +209,9 @@ namespace Results.Entities
         }
 
 
-        public virtual string PassedColorStr(string yesNoFormatOrEmpty)
+        public virtual string PassedColorStr()
         {
-            if (string.IsNullOrEmpty(yesNoFormatOrEmpty))
-            {
-                return Utils.PassedColorStr(Passed, true);
-            }
-            else
-            {
-                string[] yesNo = yesNoFormatOrEmpty.Split(new char[] { '~' });
-                return Passed ? yesNo[0] : ((yesNo.Length >= 2) ? yesNo[1] : Results.Resources.Strings.No);
-            }
+            return Utils.PassedColorStr(Passed, true);
         }
 
 
@@ -281,12 +252,7 @@ namespace Results.Entities
 					{
 						return mtr;
 					}
-                    else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
-                             mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy)
-                    {
-                        return mtr;
-                    }
-                }
+				}
 			}
 			return null;
 		}
@@ -298,21 +264,6 @@ namespace Results.Entities
 			return null;
         }
 
-        public virtual bool TryGetTestRslt(string testName, out TestRslt testRslt)
-        {
-            MeterTestRslt mtr = GetMeterTestRslt(testName);
-            if (mtr != null)
-            {
-                testRslt = mtr.TestRslt;
-                return true;
-            }
-            else
-            {
-                testRslt = null;
-                return false;
-            }
-        }
-
         public virtual TestData GetTestData(string testName)
         {
             foreach (var mtr in MeterTestRslts)
@@ -325,21 +276,6 @@ namespace Results.Entities
             return null;
         }
 
-        public virtual bool TryGetTestData(string testName, out TestData testData)
-        {
-            foreach (var mtr in MeterTestRslts)
-            {
-                if (mtr.TestRslt.TestData.Name == testName)
-                {
-                    testData = mtr.TestRslt.TestData;
-                    return true;
-                }
-            }
-
-            testData = null;
-            return false;
-        }
-
 
 
 		/// <summary>
@@ -348,12 +284,6 @@ namespace Results.Entities
 		public WaterMeter()
 		{
 			MeterTestRslts = new List<MeterTestRslt>();
-#if ORACLE_DB
-            Pruefindex = 1;
-            HydrPruefung = 0;
-            WMTypeRevision = 0;
-            TestInfos = null;
-#endif
 		}
 
 
@@ -376,39 +306,23 @@ namespace Results.Entities
 			ArchivePath = src.ArchivePath;
 			Remark = src.Remark;
 #if IPERL
+		    SerialNrEx = src.SerialNrEx;
 		    OrigCalibFactor = src.OrigCalibFactor;
 		    CalibFactor = src.CalibFactor;
 		    Q2ErrWOCorrection = src.Q2ErrWOCorrection;
 		    Q2CorrectionDone = src.Q2CorrectionDone;
             Q2Correction = src.Q2Correction;
-            Q2CorrRL = src.Q2CorrRL;
-            Q2CorrLR = src.Q2CorrLR;
+            Q2CorrRFlow = src.Q2CorrRFlow;
+            Q2CorrLFlow = src.Q2CorrLFlow;
             Q2CorrFlowRight = src.Q2CorrFlowRight;
 		    Diff2Hz8Hz = src.Diff2Hz8Hz;
 		    Hz2CorrectionDone = src.Hz2CorrectionDone;
 		    Hz2Correction = src.Hz2Correction;
 			FWVersion = src.FWVersion;
 #endif
-#if TURA_SPECIAL
-            AssignedSerialNr = src.AssignedSerialNr;
-            CompleteSerialNr = src.CompleteSerialNr;
-            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;
-#endif
 #if ORACLE_DB
-            Pruefindex = src.Pruefindex;
+		    Pruefindex = src.Pruefindex;
 		    HydrPruefung = src.HydrPruefung;
-            WMTypeRevision = src.WMTypeRevision;
-            TestInfos = src.TestInfos;
 #endif
             foreach (var mtr in MeterTestRslts)
             {
@@ -425,7 +339,7 @@ namespace Results.Entities
 		{
 			StringBuilder sb = new StringBuilder(80);
 #if IPERL
-			sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrAux);
+			sb.AppendFormat("PCB:{0} S/N:{1} ", SerialNr, SerialNrEx);
 #else
 			sb.AppendFormat("S/N:{0} ", SerialNr);
 #endif

Results/Entities/WaterMeterData.cs

@@ -54,6 +54,7 @@ namespace Results.Entities
 
 #if ORACLE_DB
 		public virtual int WMTypeId { get; set; }
+		public virtual int WMTypeRev { get; set; }
 #endif
 
         public WaterMeterData()
@@ -110,6 +111,7 @@ namespace Results.Entities
 
 #if ORACLE_DB
             if (WMTypeId != wmd.WMTypeId) return false;
+            if (WMTypeRev != wmd.WMTypeRev) return false;
 #endif
             return true;
 		}

Results/Forms/BatchResultsDlg.cs

@@ -45,7 +45,7 @@ namespace Results.Forms
         Results.BatchResults results;
         MetersKind metersKind;
 
-        OneWMResultsCtrl firstListView;
+        ListView firstListView;
         public int[] rsltsClmnWidths;
         int rsltsClmnCount { get { return (rsltsClmnWidths != null) ? rsltsClmnWidths.Length : 0; } }
 
@@ -150,9 +150,9 @@ namespace Results.Forms
                 {
                     if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
                     {
-                        OneWMResultsCtrl lview = (TestsArrangement == TestsArrangement.Rows)
-                                               ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
-                                               : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
+                        ListView lview = (TestsArrangement == TestsArrangement.Rows)
+                                       ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
+                                       : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
                         if (lview != null)
                         {
                             flowLayoutPanel.Controls.Add(lview);
@@ -182,9 +182,19 @@ namespace Results.Forms
         /// Get an empty ListView control with appropriate parameters.
         /// </summary>
         /// <returns>ListView control</returns>
-        OneWMResultsCtrl GetListView()
+        ListView GetListView()
         {
-            return new OneWMResultsCtrl(Color.White, lvWidth, lvHeight);
+            ListView lview = new ListView();
+            lview.AllowColumnReorder = false;
+            lview.Dock = System.Windows.Forms.DockStyle.None;
+            lview.FullRowSelect = true;
+            lview.GridLines = true;
+            lview.Location = new System.Drawing.Point(0, 0);
+            lview.Size = new System.Drawing.Size(lvWidth, lvHeight);
+            lview.TabIndex = 0;
+            lview.UseCompatibleStateImageBehavior = false;
+            lview.View = System.Windows.Forms.View.Details;
+            return lview;
         }
 
 
@@ -215,16 +225,11 @@ namespace Results.Forms
         /// </summary>
         /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
         /// <returns>ListView object</returns>
-        OneWMResultsCtrl GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        ListView GetResultsTestsAreRows(Results.Entities.WaterMeter wMtr, int printedWMNr)
         {
             metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
 
-            OneWMResultsCtrl lview = GetListView();
-#if ORACLE_DB
-            lview.Caption = string.Format("PCB {0}  {1} {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), Strings.repetition, (wMtr.Pruefindex % 100));
-#else
-            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-#endif
+            ListView lview = GetListView();
 
             IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
 
@@ -285,16 +290,11 @@ namespace Results.Forms
         /// </summary>
         /// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
         /// <returns>ListView object</returns>
-        OneWMResultsCtrl GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
+        ListView GetResultsTestsAreColumns(Results.Entities.WaterMeter wMtr, int printedWMNr)
         {
             metersKind = wMtr.Compound() ? MetersKind.Combined : (wMtr.HeatMeter() ? MetersKind.HeatMeter : MetersKind.Single);
 
-            OneWMResultsCtrl lview = GetListView();
-#if ORACLE_DB
-            lview.Caption = string.Format("PCB {0}  {1} {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), Strings.repetition, (wMtr.Pruefindex % 100));
-#else
-            lview.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-#endif
+            ListView lview = GetListView();
 
             IList<Results.WMeterRsltItemSpec> items = GetRsltItems(metersKind);
 

Results/Forms/ListViewExtensions.cs

@@ -1,104 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-
-namespace Results.Forms
-{
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class ListViewExtensions
-    {
-        [StructLayout(LayoutKind.Sequential)]
-        public struct HDITEM
-        {
-            public Mask mask;
-            public int cxy;
-            [MarshalAs(UnmanagedType.LPTStr)]
-            public string pszText;
-            public IntPtr hbm;
-            public int cchTextMax;
-            public Format fmt;
-            public IntPtr lParam;
-            // _WIN32_IE >= 0x0300 
-            public int iImage;
-            public int iOrder;
-            // _WIN32_IE >= 0x0500
-            public uint type;
-            public IntPtr pvFilter;
-            // _WIN32_WINNT >= 0x0600
-            public uint state;
-
-            [Flags]
-            public enum Mask
-            {
-                Format = 0x4,       // HDI_FORMAT
-            };
-
-            [Flags]
-            public enum Format
-            {
-                SortDown = 0x200,   // HDF_SORTDOWN
-                SortUp = 0x400,     // HDF_SORTUP
-            };
-        };
-
-        public const int LVM_FIRST = 0x1000;
-        public const int LVM_GETHEADER = LVM_FIRST + 31;
-
-        public const int HDM_FIRST = 0x1200;
-        public const int HDM_GETITEM = HDM_FIRST + 11;
-        public const int HDM_SETITEM = HDM_FIRST + 12;
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, ref HDITEM lParam);
-
-        public static void SetSortIcon(this ListViewEx listViewControl, int columnIndex, SortOrder order)
-        {
-            IntPtr columnHeader = SendMessage(listViewControl.Handle, LVM_GETHEADER, IntPtr.Zero, IntPtr.Zero);
-            for (int columnNumber = 0; columnNumber <= listViewControl.Columns.Count - 1; columnNumber++)
-            {
-                var columnPtr = new IntPtr(columnNumber);
-                var item = new HDITEM
-                {
-                    mask = HDITEM.Mask.Format
-                };
-
-                if (SendMessage(columnHeader, HDM_GETITEM, columnPtr, ref item) == IntPtr.Zero)
-                {
-                    throw new Win32Exception();
-                }
-
-                if (order != SortOrder.None && columnNumber == columnIndex)
-                {
-                    switch (order)
-                    {
-                        case SortOrder.Ascending:
-                            item.fmt &= ~HDITEM.Format.SortDown;
-                            item.fmt |= HDITEM.Format.SortUp;
-                            break;
-
-                        case SortOrder.Descending:
-                            item.fmt &= ~HDITEM.Format.SortUp;
-                            item.fmt |= HDITEM.Format.SortDown;
-                            break;
-
-                        default:
-                            break;
-                    }
-                }
-                else
-                {
-                    item.fmt &= ~HDITEM.Format.SortDown & ~HDITEM.Format.SortUp;
-                }
-
-                if (SendMessage(columnHeader, HDM_SETITEM, columnPtr, ref item) == IntPtr.Zero)
-                {
-                    throw new Win32Exception();
-                }
-            }
-        }
-    }
-}

Results/Forms/LviIntColumnComparer.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace Results.Forms
-{
-    public class LviIntColumnComparer : IComparer
-    {
-        int column;
-        SortOrder order;
-
-        public LviIntColumnComparer()
-        {
-            column = 0;
-            order = SortOrder.Ascending;
-        }
-
-        public LviIntColumnComparer(int column, SortOrder order)
-        {
-            this.column = column;
-            this.order = order;
-        }
-
-        public int Compare(object x, object y)
-        {
-            int valX = int.Parse(((ListViewItem)x).SubItems[column].Text);
-            int valY = int.Parse(((ListViewItem)y).SubItems[column].Text);
-            return (order == SortOrder.Descending) ? (valY - valX) : (valX - valY);
-        }
-    }
-}

Results/Forms/LviTextColumnComparer.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace Results.Forms
-{
-    public class LviTextColumnComparer : IComparer
-    {
-        private int column;
-        SortOrder order;
-
-        public LviTextColumnComparer()
-        {
-            column = 0;
-            order = SortOrder.Ascending;
-        }
-
-        public LviTextColumnComparer(int column, SortOrder order)
-        {
-            this.column = column;
-            this.order = order;
-        }
-
-        public int Compare(object x, object y)
-        {
-            string txtX = ((ListViewItem)x).SubItems[column].Text;
-            string txtY = ((ListViewItem)y).SubItems[column].Text;
-            return (order == SortOrder.Descending) ? String.Compare(txtY, txtX) : String.Compare(txtX, txtY);
-        }
-    }
-}

Results/Forms/OneWMResultsCtrl.Designer.cs

@@ -1,102 +0,0 @@
-namespace Results.Forms
-{
-    partial class OneWMResultsCtrl
-    {
-        /// <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 Component 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.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.tBox = new System.Windows.Forms.TextBox();
-            this.lView = new System.Windows.Forms.ListView();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            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.tBox);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.lView);
-            this.splitContainer1.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.SplitterDistance = 25;
-            this.splitContainer1.SplitterWidth = 1;
-            this.splitContainer1.TabIndex = 0;
-            // 
-            // tBox
-            // 
-            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.TabIndex = 0;
-            // 
-            // lView
-            // 
-            this.lView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lView.FullRowSelect = true;
-            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.TabIndex = 0;
-            this.lView.UseCompatibleStateImageBehavior = false;
-            this.lView.View = System.Windows.Forms.View.Details;
-            // 
-            // OneWMResultsCtrl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.splitContainer1);
-            this.Name = "OneWMResultsCtrl";
-            this.Size = new System.Drawing.Size(352, 318);
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel1.PerformLayout();
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.TextBox tBox;
-        private System.Windows.Forms.ListView lView;
-    }
-}

Results/Forms/OneWMResultsCtrl.cs

@@ -1,26 +0,0 @@
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace Results.Forms
-{
-    public partial class OneWMResultsCtrl : UserControl
-    {
-        public OneWMResultsCtrl()
-        {
-            InitializeComponent();
-        }
-
-        public OneWMResultsCtrl(Color backColor, int lvWidth, int lvHeight)
-            : this()
-        {
-            lView.BackColor = backColor;
-            tBox.BackColor = backColor;
-            Size = new System.Drawing.Size(lvWidth, lvHeight);
-        }
-
-        public string Caption { get { return tBox.Text; } set { tBox.Text = value; } }
-        public ListView.ColumnHeaderCollection Columns { get { return lView.Columns; } }
-        public ListView.ListViewItemCollection Items { get { return lView.Items; } }
-        public Color BColor { set { lView.BackColor = value; tBox.BackColor = value; } }
-    }
-}

Results/ItemID.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2017 Sensus Metering Systems
 ///
 using System;
 
@@ -71,7 +71,7 @@ namespace Results
         Pulse__liter,                   /// 61  Water meter constant (pulses per liter) specific for one test
         Reference_pulses_ni,            /// 62  Reference pulses gated for specific meter (synchro method)
         Reference_energy,				/// 63
-        Bench_ID,                       /// 64  Test bench ID (int) obtained from a component implementing IBenchInfo
+        Test_bench_ID,                  /// 64
         Program_version,                /// 65
         User_name,                      /// 66
         User_nr,                        /// 67
@@ -91,85 +91,85 @@ namespace Results
         T_Lo_start,                     /// 81
         T_Lo_end,                       /// 82
         T_Lo_avg,                       /// 83
-        P_delta_mean,                   /// 84
-        P_delta_start,                  /// 85
-        P_delta_end,                    /// 86
-        Meter_type,						/// 87   Single, Compound or HeatMeter
-        Volume_main,					/// 88
-        Volume_aux,					    /// 89
-        Start_volume,					/// 90
-        Start_volume_main,				/// 91
-        Start_volume_aux,				/// 92
-        End_volume,				        /// 93
-        End_volume_main,				/// 94
-        End_volume_aux,				    /// 95   
-        Error_main,						/// 96
-        Error_aux,						/// 97
-        Serial_Nr_main,					/// 98
-        Serial_Nr_aux,					/// 99
-        End_state_main,					/// 100
-        End_state_aux,					/// 101
-        Q_rise,							/// 102
-        Q_fall,							/// 103
+		P_delta_mean,                   /// 84
+		P_delta_start,                  /// 85
+		P_delta_end,                    /// 86
+		Meter_type,						/// 87   Single, Compound or HeatMeter
+		Volume_main,					/// 88
+		Volume_aux,					    /// 89
+		Start_volume,					/// 90
+		Start_volume_main,				/// 91
+		Start_volume_aux,				/// 92
+		End_volume,				        /// 93
+		End_volume_main,				/// 94
+		End_volume_aux,				    /// 95   
+		Error_main,						/// 96
+		Error_aux,						/// 97
+		Serial_Nr_main,					/// 98
+		Serial_Nr_aux,					/// 99
+		End_state_main,					/// 100
+		End_state_aux,					/// 101
+		Q_rise,							/// 102
+		Q_fall,							/// 103
 
-        /// iPerl
+		/// iPerl
         OrigCalibFactor,            	/// 104
-        CalibFactor,	                /// 105
-        Q2ErrWOCorrection,              /// 106
-        Q2CorrectionDone,               /// 107
+		CalibFactor,	                /// 105
+		Q2ErrWOCorrection,              /// 106
+		Q2CorrectionDone,               /// 107
         Q2CorrRFlow,	                /// 108
         Q2CorrLFlow,                	/// 109
         Q2CorrFlowRight,            	/// 110
 
-        Q_ref_mean,						/// 111
-        T_up_start,						/// 112
-        T_up_end,						/// 113
-        T_up_avg,						/// 114
-        T_down_start,					/// 115
-        T_down_end,						/// 116
-        T_down_avg,						/// 117
-        T_div_start,					/// 118
-        T_div_end,						/// 119
-        T_div_avg,						/// 120
-        P_up_avg,						/// 121
-        P_down_avg,						/// 122
-        P_delta_avg,					/// 123
-
-        TestDone,						/// 124
-        TestPassed,						/// 125
+		Q_ref_mean,						/// 111
+		T_up_start,						/// 112
+		T_up_end,						/// 113
+		T_up_avg,						/// 114
+		T_down_start,					/// 115
+		T_down_end,						/// 116
+		T_down_avg,						/// 117
+		T_div_start,					/// 118
+		T_div_end,						/// 119
+		T_div_avg,						/// 120
+		P_up_avg,						/// 121
+		P_down_avg,						/// 122
+		P_delta_avg,					/// 123
+		
+		TestDone,						/// 124
+		TestPassed,						/// 125
 
         /// iPerl
         FW_Version,            	        /// 126
 
-        Mass_start_raw,					/// 127
-        Mass_start,						/// 128
-        Mass_end_raw,					/// 129
-        Mass_end,						/// 130
-        Mass,							/// 131
-        Buoyancy,						/// 132
-        Density_correction,				/// 133
+		Mass_start_raw,					/// 127
+		Mass_start,						/// 128
+		Mass_end_raw,					/// 129
+		Mass_end,						/// 130
+		Mass,							/// 131
+		Buoyancy,						/// 132
+		Density_correction,				/// 133
 
-        ErrorFlags,						/// 134
-        E1,								/// 135
-        E2,								/// 136
-        E3,								/// 137
-        E4,								/// 138
-        E5,								/// 139
-        E6,								/// 140
-        E7,								/// 141
-        E8,								/// 142
-        E9,								/// 143
-        E10,							/// 144
-        E11,							/// 145
-        E12,							/// 146
-        E13,							/// 147
-        E14,							/// 148
-        E15,							/// 149
-        E16,							/// 150
+		ErrorFlags,						/// 134
+		E1,								/// 135
+		E2,								/// 136
+		E3,								/// 137
+		E4,								/// 138
+		E5,								/// 139
+		E6,								/// 140
+		E7,								/// 141
+		E8,								/// 142
+		E9,								/// 143
+		E10,							/// 144
+		E11,							/// 145
+		E12,							/// 146
+		E13,							/// 147
+		E14,							/// 148
+		E15,							/// 149
+		E16,							/// 150
 
-        Table_row_nr,					/// 151
-        Table_column_nr,				/// 152
-        WMRemark,                       /// 153
+		Table_row_nr,					/// 151
+		Table_column_nr,				/// 152
+		WMRemark,                       /// 153
 
         User_description,               /// 154
         Legalizator,                    /// 155
@@ -181,7 +181,7 @@ namespace Results
         Diverter_start_time,            /// 159
         Diverter_end_time,              /// 160
         Q_sensitivity,                  /// 161
-
+                                    
         Q_ref_min,                      /// 162
         Q_ref_max,                      /// 163
         Q_ref_start,                    /// 164
@@ -210,7 +210,7 @@ namespace Results
         Rho_Wa_calc,                    /// 183
 
         Formatted_WM_ID,                /// 184, Formated WM ID string:
-        ///      {0}=start DateTime {1}-end DateTime, {2}=batch nr., {3}=wm pos.(1..max), {4}=s/n string
+                                        ///      {0}=start DateTime {1}-end DateTime, {2}=batch nr., {3}=wm pos.(1..max), {4}=s/n string
         E21,							/// 185
 
         T_line_mean,					/// 186
@@ -251,46 +251,6 @@ namespace Results
         Flow_ctv_start,                 /// 217
         Flow_ctv_end,                   /// 218
         ConstMasterRaw,                 /// 219  ConstMaster (like 194) uncorrected
-        Reference_error_corr,           /// 220  Reference flow meter error after correction using correction curve
-
-        Proc_description,               /// 221  Procedure description (CEVAK, not mapped to DB)
-        Bench_name,                     /// 222  'Test bench name' (string) obtained from a component implementing IBenchInfo
-        Bench_address1,                 /// 223  'Address 1' from IBenchInfo
-        Bench_address2,                 /// 224  'Address 2' from IBenchInfo
-        Bench_address3,                 /// 225  'Address 3' from IBenchInfo
-        Bench_address4,                 /// 226  'Address 4' from IBenchInfo
-        Bench_address5,                 /// 227  'Address 5' from IBenchInfo
-
-        Max_test_index,                 /// 228  MaxPruefindex % 100
-        VolumeCTV,						/// 229
-
-        /// iPerl
-        LastError,                      /// 230  For iPerl previous test result (test with Proefindex-1)
-        OrigCalibFactorLNA,            	/// 231
-        CalibFactorLNA,	                /// 232
-
-        WM_remark,                      /// 233
-
-        /// iPerl special
-        Prod_AssignedSerialNr,          /// 234
-        Prod_CompleteSerialNr,          /// 235
-        Prod_RadioAddress,              /// 236
-        Prod_PaletteNr,                 /// 237
-        Prod_UmkartonNr,                /// 238
-        Prod_TestBench,                 /// 239
-        Prod_WMPosition,                /// 240
-        Prod_UserName,                  /// 241
-        Prod_PurchaseOrder,             /// 242
-        Prod_Passed,                    /// 243
-        Prod_ResultCode,                /// 244
-        Prod_Q2CorrRL,	                /// 245
-        Prod_Q2CorrLR,                  /// 246
-
-        TestPartStr,                    /// 247
-        
-        Error_heat_mtr_vol,              /// 248
-        Energy_start,
-        Energy_end,
 
         Count,
     }

Results/Mappings/MeterTestRsltMap.cs

@@ -25,10 +25,8 @@ namespace Results.Mappings
 			Map(x => x.Error);
 			Map(x => x.TestDone);
 			Map(x => x.Passed);
-#if ORACLE_DB
-            Map(x => x.LastError);
-#endif
-            References(x => x.WaterMeter);
+
+			References(x => x.WaterMeter);
 			References(x => x.TestRslt);
 		}
 	}

Results/Mappings/TestRsltMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2017 Sensus Metering Systems
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;

Results/Mappings/WaterMeterDataMap.cs

@@ -54,6 +54,7 @@ namespace Results.Mappings
 #endif
 #if ORACLE_DB
 			Map(x => x.WMTypeId);
+			Map(x => x.WMTypeRev);
 #endif
         }
 	}

Results/Mappings/WaterMeterMap.cs

@@ -28,41 +28,21 @@ namespace Results.Mappings
 				.CustomType("StringClob")
 				.CustomSqlType("varchar(2000)");
 #if IPERL
+			Map(x => x.SerialNrEx);
 			Map(x => x.OrigCalibFactor);
 			Map(x => x.CalibFactor);
-            Map(x => x.OrigCalibFactorLNA);
-            Map(x => x.CalibFactorLNA);
-            Map(x => x.Q2ErrWOCorrection);
+			Map(x => x.Q2ErrWOCorrection);
 			Map(x => x.Q2CorrectionDone);
 			Map(x => x.Q2Correction);
-            Map(x => x.Q2CorrRL);
-            Map(x => x.Q2CorrLR);
+            Map(x => x.Q2CorrRFlow);
+            Map(x => x.Q2CorrLFlow);
             Map(x => x.Q2CorrFlowRight);
 			Map(x => x.Diff2Hz8Hz);
 			Map(x => x.Hz2CorrectionDone);
 			Map(x => x.Hz2Correction);
 			Map(x => x.FWVersion);
 #endif
-#if TURA_SPECIAL
-            Map(x => x.AssignedSerialNr);
-            Map(x => x.CompleteSerialNr);
-            Map(x => x.RadioAddress);
-            Map(x => x.PaletteNr);
-            Map(x => x.UmkartonNr);
-            Map(x => x.ProdTestBench);
-            Map(x => x.ProdWMPosition);
-            Map(x => x.ProdUserName);
-            Map(x => x.ProdPurchaseOrder);
-            Map(x => x.ProdPassed);
-            Map(x => x.ProdResultCode);
-            Map(x => x.ProdQ2CorrRL);
-            Map(x => x.ProdQ2CorrLR);
-#endif
-#if ORACLE_DB
-            Map(x => x.Pruefindex);
-            Map(x => x.HydrPruefung);
-#endif
-            References(x => x.WaterMeterData);
+			References(x => x.WaterMeterData);
 			References(x => x.Batch);
 			HasMany(x => x.MeterTestRslts)
 				.Cascade.All();

Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs

@@ -185,7 +185,7 @@ namespace Results.Output.Printers.Enhanced
 
                 Table table0 = Table.Create_TestsAreRows(batch.WaterMeters[0], testItems, style);
                 SizeF tableSize = table0.Measure(e);
-                int wmSectionHeight = (int)tableSize.Height + SpacingOne4Header * ((tableSize.Height > 0) ? 3 : 2);
+                int wmSectionHeight = (int)tableSize.Height + 3 * SpacingOne4Header;
 
                 nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight;
                 nrWMsOnNextPage = (printHeight - 2 * SpacingOne) / wmSectionHeight;
@@ -239,10 +239,7 @@ namespace Results.Output.Printers.Enhanced
 			for (int wmNr = nextWMNr; wmNr < Math.Min(nextWMNr + nrWMsOnPage, batch.WaterMeters.Count); wmNr++)	/// wmNr is 0-based
 			{
 				int wmPosition = true ? batch.WaterMeters[wmNr].WMPosition : (wmNr + 1);
-                if (!cfg.GoodOnly || batch.WaterMeters[wmNr].Passed)
-                {
-                    nextWmTop = (int)PrintWM(e, batch.WaterMeters[wmNr], wmPosition, nextWmTop) + SpacingOneAndHalf4Header;
-                }
+                nextWmTop = (int)PrintWM(e, batch.WaterMeters[wmNr], wmPosition, nextWmTop) + SpacingOneAndHalf4Header;
 			}
 
 			nextWMNr += nrWMsOnPage;
@@ -268,7 +265,7 @@ namespace Results.Output.Printers.Enhanced
 		/// <param name="top">Top coordinate of watermeter data</param>
 		/// <returns>The height of the printed section</returns>
 		float PrintWM(System.Drawing.Printing.PrintPageEventArgs e,
-					  Results.Entities.WaterMeter wm, int printedWMNr, int top)
+					Results.Entities.WaterMeter wm, int printedWMNr, int top)
 		{
             /// Print the water meter number and the serial number
             string wmText = string.Format("{0} {1}", Strings.Water_Meter, printedWMNr);
@@ -281,14 +278,7 @@ namespace Results.Output.Printers.Enhanced
 
             Table table = Table.Create_TestsAreRows(wm, testItems, style);
 
-            if (table.IsEmpty())
-            {
-                return top;
-            }
-            else
-            {
-                return table.Draw(e, leftMargin, top + SpacingOneAndHalf4Header);
-            }
+            return table.Draw(e, leftMargin, top + SpacingOneAndHalf4Header);
 		}
 
 

Results/Output/Printers/Label/LabelPrintDocument.cs

@@ -1,98 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Printing;
-using System.IO;
-using Config.Entities;
-using Results.Resources;
-
-namespace Results.Output.Printers.Label
-{
-	public class LabelPrintDocument : PrintersCommon
-	{
-		/// Size of the printed area without margins, after taking into account 'pageOrientation'
-		readonly int printHeight;
-		readonly int printWidth;
-
-		/// Selected font
-		readonly Font font;
-
-		/// Data to print
-		Results.Entities.Batch batch;
-		LabelPrinterCfg cfg;
-        Results.Entities.WaterMeter wm;
-
-		/// Items to print
-        IList<WMeterRsltItemSpec> itemsToPrint;
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="textToPrint">Text to be printed</param>
-        public LabelPrintDocument(Results.Entities.Batch batch, LabelPrinterCfg cfg, Results.Entities.WaterMeter wm, string documentName)
-		{
-			DocumentName = documentName;
-
-			this.batch = batch;
-			this.cfg = cfg;
-            this.wm = wm;
-			this.itemsToPrint = Results.WMeterRsltItemSpec.FromStrArray(cfg.ItemsToPrint);
-
-			/// Initialize fonts
-			font = new Font((cfg.FontFamily != null ? cfg.FontFamily : "Arial"),
-							(cfg.FontSize > 0 ? cfg.FontSize : 10),
-							(FontStyle)cfg.FontStyle);
-
-			/// Set print area size and margins (in dots using 100 dpi)
-			DefaultPageSettings.Landscape = (cfg.PageOrientation == PageOrientation.Landscape);
-			///
-			printHeight = cfg.PaperHeight;
-			printWidth = cfg.PaperWidth;
-        }
-
-		/// <summary>
-		/// Override the default onbeginPrint method of the PrintDocument Object
-		/// </summary>
-		/// <param name=e></param>
-		/// <remarks></remarks>
-		protected override void OnBeginPrint(System.Drawing.Printing.PrintEventArgs e)
-		{
-			base.OnBeginPrint(e);
-		}
-
-		/// <summary>
-		/// Override the default OnPrintPage method of the PrintDocument.
-		/// </summary>
-		/// <param name=e></param>
-		/// <remarks>This provides the print logic for our document</remarks>
-		protected override void OnPrintPage(System.Drawing.Printing.PrintPageEventArgs e)
-		{
-            /// Run base code
-            base.OnPrintPage(e);
-
-            if (!string.IsNullOrEmpty(cfg.Template))
-            {
-                string templatePath = Path.Combine("C:\\TBF\\Templates\\", cfg.Template);
-                if (File.Exists(templatePath))
-                {
-					e.Graphics.DrawImage(new Bitmap(Image.FromFile(templatePath), printWidth, printHeight), new Rectangle(0, 0, printWidth, printHeight));
-                }
-            }
-
-			foreach (var item in itemsToPrint)
-			{
-				string[] coords = item.Caption.Split(new char[] { ';' });
-				int x, y;
-				if (coords.Length >= 2 && int.TryParse(coords[0].Trim(new char[] { ' ' }), out x)
-									   && int.TryParse(coords[1].Trim(new char[] { ' ' }), out y))
-				{
-					RectangleF printArea = new RectangleF(x, y, printWidth, printHeight);
-					e.Graphics.DrawString(item.Print(wm), this.font, Brushes.Black, printArea);
-				}
-			}
-		}
-    }
-}

Results/Output/Printers/Label/LabelPrinterCfg.cs

@@ -1,21 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-
-namespace Results.Output.Printers.Label
-{
-	public class LabelPrinterCfg
-	{
-		public string Template;								/// Full path to a 'png' file
-		public Config.Entities.PageOrientation PageOrientation;
-		public int PaperWidth;								/// In 0,254 mm = 1/100 in = 100dpi pixels count
-		public int PaperHeight;								/// In 0,254 mm = 1/100 in = 100dpi pixels count
-		public string[] ItemsToPrint;
-		public string FontFamily;
-		public int FontSize;
-		public int FontStyle;
-		public System.Globalization.CultureInfo CultureInfo;
-		public bool GoodOnly;
-		public bool SupressPrinting;						/// true = Bypass printing
-	}
-}

Results/Output/Printers/Munich/MunichPrintDocument.cs

@@ -1,13 +1,11 @@
 ///
-/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
 using Config.Entities;
-using System.IO;
-using Results.Resources;
 
 namespace Results.Output.Printers.Munich
 {
@@ -40,16 +38,11 @@ namespace Results.Output.Printers.Munich
         readonly int resultsCount;
 		readonly bool compound;			/// true when MetersKind is MetersKind.Combined												
 										
-		
-		int pageNr;         /// Current page number
-        int nrPages;        /// Total number of pages
-        float tableTop;     /// Top coordinate of the table
-
-        int[] firstTblRowsOnPage;
-        int[] secondTblRowsOnPage;
-
-        
-        PageOrientation pageOrientation;
+		/// Top coordinate of the table
+		int nrPages;
+		int pageNr;
+		int firstTblTop;
+		int secondTblTop;
 
 		/// <summary>
 		/// Property variable for the Font the user wishes to use
@@ -58,34 +51,7 @@ namespace Results.Output.Printers.Munich
         Font boldFont;
         Font fontTitle;
 
-        ///
-        /// Table style
-        ///
-        static TableStyle tableStyle = new TableStyle
-        {
-            Font = new Font(FontFamilyName, 10, FontStyle.Regular),
-            HeaderFont = new Font(FontFamilyName, 10, FontStyle.Regular),
-            MarginX = 7,
-            MarginY = 5,
-            LineWidth = 1,
-            TopHeadersCount = 1,
-            HorizLines = TableLines.FirstSecondAndLast,
-            VertLines = TableLines.All,
-            ColumnWidths = new float[] { 150, 70, 75, 75, 70, 75, 75 },
-        };
-        static Alignment[] horizontalAlignment = new Alignment[]        /// Horizontal alignment of items of one row
-        {
-            Alignment.Left, Alignment.Left, Alignment.Left,
-            Alignment.Left, Alignment.Left, Alignment.Left, Alignment.Left
-        };
-        static VertAlignment[] verticalAlignment = new VertAlignment[]  /// Vertical alignment of items of one row
-        {
-            VertAlignment.Middle, VertAlignment.Middle, VertAlignment.Middle,
-            VertAlignment.Middle, VertAlignment.Middle, VertAlignment.Middle, VertAlignment.Middle
-        };
-
-
-        /// <summary>
+		/// <summary>
 		/// Constructor
 		/// </summary>
 		/// <param name="textToPrint">Text to be printed</param>
@@ -95,8 +61,7 @@ namespace Results.Output.Printers.Munich
 		{
             this.docVersion = docVersion;
 			this.wm = wm;
-			this.compound = wm.Compound();
-            this.pageOrientation = pageOrientation;
+			compound = wm.Compound();
 
             string[] info = wm.ProductName().Split(new char[] { ';' });
             if (info.Length >= 2)
@@ -116,88 +81,13 @@ namespace Results.Output.Printers.Munich
             }
 
 			results = wm.MeterTestRslts;
+            this.resultsCount = compound ? (results.Count / 3) : results.Count;
 
-			resultsCount = 0;
-            foreach (var mtr in wm.MeterTestRslts)
-            {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) resultsCount++;
-            }
+			int resultsCount = wm.MeterTestRslts.Count;
+			if (compound) resultsCount /= 3;
 
 			pageNr = 1;
-            if (compound)
-            {
-                /// Compound meter results
-                const int MaxOnFirstPage = 23;
-                const int MaxOnPage = 45;
-                if (resultsCount <= 7)
-                {
-                    nrPages = 1;
-                    firstTblRowsOnPage = new int[] { resultsCount };
-                    secondTblRowsOnPage = new int[] { resultsCount };
-                }
-                else if (resultsCount <= MaxOnFirstPage)
-                {
-                    nrPages = 2;
-                    firstTblRowsOnPage = new int[] { resultsCount, 0 };
-                    secondTblRowsOnPage = new int[] { 0, int.MaxValue };
-                }
-                else if (resultsCount <= MaxOnPage)
-                {
-                    nrPages = 3;
-                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, (resultsCount - MaxOnFirstPage), 0 };
-                    int secondTblRowsOn2ndPage = Math.Max(0, MaxOnFirstPage + MaxOnPage - 2 - resultsCount);
-                    secondTblRowsOnPage = new int[] { 0, secondTblRowsOn2ndPage, resultsCount - secondTblRowsOn2ndPage };
-                }
-                else if (resultsCount <= MaxOnFirstPage + MaxOnPage)
-                {
-                    nrPages = 4;
-                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, 0, 0 };
-                    secondTblRowsOnPage = new int[] { 0, 0, MaxOnPage, MaxOnFirstPage };
-                }
-                else
-                {
-                    nrPages = 5;
-                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, (resultsCount - MaxOnFirstPage - MaxOnPage), 0 };
-                    secondTblRowsOnPage = new int[] { 0, 0, Math.Max(0, MaxOnFirstPage + 2 * MaxOnPage - 2 - resultsCount), MaxOnPage, MaxOnFirstPage };
-                }
-            }
-            else
-            {
-                /// Regular (single) meter results
-                const int MaxOnFirstPage = 27;
-                const int MaxOnPage = 45;
-                if (resultsCount <= 9)
-                {
-                    nrPages = 1;
-                    firstTblRowsOnPage = new int[] { resultsCount };
-                    secondTblRowsOnPage = new int[] { resultsCount };
-                }
-                else if (resultsCount <= MaxOnFirstPage)
-                {
-                    nrPages = 2;
-                    firstTblRowsOnPage = new int[] { resultsCount, 0 };
-                    secondTblRowsOnPage = new int[] { 0, int.MaxValue };
-                }
-                else if (resultsCount <= MaxOnPage)
-                {
-                    nrPages = 3;
-                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, (resultsCount - MaxOnFirstPage), 0 };
-                    int secondTblRowsOn2ndPage = Math.Max(0, MaxOnFirstPage + MaxOnPage - 2 - resultsCount);
-                    secondTblRowsOnPage = new int[] { 0, secondTblRowsOn2ndPage, resultsCount - secondTblRowsOn2ndPage };
-                }
-                else if (resultsCount <= MaxOnFirstPage + MaxOnPage)
-                {
-                    nrPages = 4;
-                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, 0, 0 };
-                    secondTblRowsOnPage = new int[] { 0, 0, MaxOnPage, MaxOnFirstPage };
-                }
-                else
-                {
-                    nrPages = 5;
-                    firstTblRowsOnPage = new int[] { MaxOnFirstPage, MaxOnPage, (resultsCount - MaxOnFirstPage - MaxOnPage), 0 };
-                    secondTblRowsOnPage = new int[] { 0, 0, Math.Max(0, MaxOnFirstPage + 2 * MaxOnPage - 2 - resultsCount), MaxOnPage, MaxOnFirstPage };
-                }
-            }
+			nrPages = (compound ? (resultsCount > 7) : (resultsCount > 9)) ? 2 : 1;
 
 			DefaultPageSettings.Landscape = (pageOrientation == PageOrientation.Landscape);
 		}
@@ -226,30 +116,8 @@ namespace Results.Output.Printers.Munich
 			/// Run base code
 			base.OnPrintPage(e);
 
-            if (pageOrientation == PageOrientation.Portrait)
-            {
-                string[] templatePaths = new string[] { "C:\\TBF\\Templates\\MunichP.jpg", "C:\\TBF\\Templates\\MunichP.png", "C:\\TBF\\Templates\\MunichP.tif" };
-                foreach (var t in templatePaths)
-                {
-                    if (File.Exists(t))
-                    {
-                        e.Graphics.DrawImage(new Bitmap(Image.FromFile(t), 827, 1169), new Rectangle(0, 0, 827, 1169));
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                string[] templatePaths = new string[] { "C:\\TBF\\Templates\\MunichL.jpg", "C:\\TBF\\Templates\\MunichL.png", "C:\\TBF\\Templates\\MunichL.tif" };
-                foreach (var t in templatePaths)
-                {
-                    if (File.Exists(t))
-                    {
-                        e.Graphics.DrawImage(new Bitmap(Image.FromFile(t), 1169, 827), new Rectangle(0, 0, 1169, 827));
-                        break;
-                    }
-                }
-            }
+			/// Draw 2550 x 3507 'headpic' scaled to A4 at 100 DPI
+			e.Graphics.DrawImage(Results.Properties.Resources.Headpic, new Rectangle(0, 0, 827, 1137));
 
 			/// Set print area size and margins (in dots using 80 dpi)
 			int printHeight = base.DefaultPageSettings.PaperSize.Height - base.DefaultPageSettings.Margins.Top - base.DefaultPageSettings.Margins.Bottom;
@@ -276,21 +144,27 @@ namespace Results.Output.Printers.Munich
 
 			if (pageNr == 1)
 			{
-                /// This is the first page, drad the title, common part and the 1st table
-                
-                RectangleF printArea = new RectangleF(TitleX, TitleY, 667, 50);
+				RectangleF printArea = new RectangleF(TitleX, TitleY, 667, 50);
 				e.Graphics.DrawString(wm.Batch.ProtocolTitle, this.fontTitle, Brushes.Black, printArea);
 
-                DrawCommonTop(e, ref lineNr, wm, pruefvorlage, docVersion);
-
+				///
+				/// Common
+				/// 
+				PrintAt(e, Tab1, lineNr * SpacingOne, docVersion);
+				lineNr++;
+				PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Prüfstand Nr :");
+				PrintBoldAt(e, Tab2, lineNr * SpacingOne, wm.BenchId().ToString());
+				PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Datum :");
+				PrintBoldAt(e, Tab4, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d"));
+				lineNr++;
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Zählertyp :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, zaehlertyp);
+				PrintAt(e, Tab3, lineNr * SpacingOne, "Eichjahr :");
+				PrintAt(e, Tab4, lineNr * SpacingOne, wm.YearOfProduction.ToString());
+				lineNr++;
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Prüfvorlage :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, pruefvorlage);
 				lineNr += 2;
-				tableTop = SpacingOne * lineNr;
-			}
-			else
-			{
-                /// This appears on the top of the 2nd and every subsequent page.
-                /// 2nd table starts from the top of the page.
-				lineNr -= 3;
 
 				if (compound)
 				{
@@ -315,294 +189,228 @@ namespace Results.Output.Printers.Munich
 					PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
 					PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
 				}
-				lineNr += ((resultsCount + 2) * SpacingOneAndHalf) / SpacingOne + 2;
+				lineNr++;
 
-                tableTop = TitleY + (compound ? 5 : 4) * SpacingOne;
+				PrintAt(e, Tab1, lineNr * SpacingOne, wm.NewQnames() ? "Q3 :" : "Qn :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.Q3_Qn().ToString());
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, wm.NewQnames() ?  "Q3 :" : "Qn :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.Q3_Qn_Aux().ToString());
+				}
+				lineNr++;
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Zulassungszeichen :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.ApprovalInfo());
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Zulassungszeichen :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.ApprovalInfoAux());
+				}
+				lineNr++;
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Metr. klasse :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.MetrologicalClass());
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Metr. klasse :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.MetrologicalClassAux());
+				}
+				lineNr++;
+
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Stand :");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.EndState);
+				if (compound)
+				{
+					PrintAt(e, Tab3, lineNr * SpacingOne, "Stand :");
+					PrintAt(e, Tab4, lineNr * SpacingOne, wm.EndStateAux);
+
+					lineNr += 2;
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Umschaltpunkte :");
+					lineNr++;
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Qsteig");
+					PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QRise).ToString("F1") + " l/h");
+					lineNr++;
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Qfall");
+					PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QFall).ToString("F1") + " l/h");
+				}
+
+				lineNr += 2;
+				firstTblTop = SpacingOne * lineNr;
+
+				///
+				/// Table 1
+				///
+				PrintTableOne(e, firstTblTop);
+				DrawTableFrame(e, resultsCount + 1, firstTblTop);
 			}
 
-            if (firstTblRowsOnPage[pageNr - 1] > 0)
-            {
-                int from = 0;
-                for (int pN = 0; pN < pageNr - 1; pN++) from += firstTblRowsOnPage[pN];
-                Table table1 = PrepareTableOne(from, from + firstTblRowsOnPage[pageNr - 1] - 1);
-                tableTop = table1.Draw(e, Tab1, tableTop) + SpacingOneAndHalf;
-            }
 
+			if (pageNr == nrPages)
+			{
+				if (pageNr == 1)
+				{
+					secondTblTop = firstTblTop + (resultsCount + 2) * SpacingOneAndHalf;
+					lineNr += ((resultsCount + 2) * SpacingOneAndHalf * 2) / SpacingOne;
+				}
+				else
+				{
+					lineNr -= 3;
 
-            if (secondTblRowsOnPage[pageNr - 1] > 0)
-            {
-                int from = 0;
-                for (int pN = 0; pN < pageNr - 1; pN++) from += secondTblRowsOnPage[pN];
-                Table table2 = PrepareTableTwo(from, from + secondTblRowsOnPage[pageNr - 1] - 1);
-                tableTop = table2.Draw(e, Tab1, tableTop) + SpacingOneAndHalf;
-            }
+					if (compound)
+					{
+						PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler");
+						PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler");
+						lineNr++;
+					}
 
-            if (pageNr == nrPages)
-            {
-                int top = topMargin + printHeight - 8 * SpacingOne;
-                DrawCommonBottom(e, top, wm);
-            }
-            else
-            {
-                e.HasMorePages = true;
-            }
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Hersteller :");
+					PrintAt(e, Tab2, lineNr * SpacingOne, wm.Producer());
+					if (compound)
+					{
+						PrintAt(e, Tab3, lineNr * SpacingOne, "Hersteller :");
+						PrintAt(e, Tab4, lineNr * SpacingOne, wm.ProducerAux());
+					}
+					lineNr++;
 
-            ///
-            ///  Draw a footer and increment the page number
-            ///
-            string pageNrText = string.Format("{0} {1}/{2}", Strings.Page, pageNr++, nrPages);
-            int pageNrWidth = (int)e.Graphics.MeasureString(pageNrText, font).Width;
-            PrintAt(e, leftMargin + (printWidth - pageNrWidth) / 2, topMargin + printHeight - SpacingOne, pageNrText);
-        }
+					PrintAt(e, Tab1, lineNr * SpacingOne, "Seriennummer :");
+					PrintAt(e, Tab2, lineNr * SpacingOne, wm.SerialNr);
+					if (compound)
+					{
+						PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
+						PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
+					}
+					lineNr += ((resultsCount + 2) * SpacingOneAndHalf) / SpacingOne + 2;
+
+					secondTblTop = TitleY + (compound ? 5 : 4) * SpacingOne;
+				}
+
+				///
+				/// Table 2
+				///
+				PrintTableTwo(e, secondTblTop);
+				DrawTableFrame(e, resultsCount + 1, secondTblTop);
+
+				///
+				/// Footer
+				/// 
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Temperatur");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbTempMean().ToString("F1") + " \x00b0C");
+				lineNr++;
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Feuchtigkeit");
+				PrintAt(e, Tab2, lineNr * SpacingOne, wm.Batch.AmbHumiMean().ToString("F0") + " %");
+				lineNr++;
+				PrintAt(e, Tab1, lineNr * SpacingOne, "Luftdruck");
+				PrintAt(e, Tab2, lineNr * SpacingOne, Config.Units.ConvertTo(Config.Unit.mbar, wm.Batch.AmbPressMean()).ToString("F0") + " mbar");
+
+				lineNr++;
+				PrintAt(e, Tab3, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d"));
+				lineNr++;
+				PrintAt(e, Tab3, lineNr * SpacingOne, "Datum");
+				PrintAt(e, Tab4, lineNr * SpacingOne, "Unterschrift");
+			}
+
+			e.HasMorePages = (pageNr != nrPages);
+			pageNr++;
+		}
 
 		/// <summary>
-		/// Prepares content and style of the first table.
+		/// Print table texts.
 		/// </summary>
-        /// <param name="from">0-based index fo the first result to print</param>
-        /// <param name="to">0-based index fo the last result to print</param>
-        /// <returns>Prepared table</returns>
-        Table PrepareTableOne(int from = 0, int to = int.MaxValue)
+		void PrintTableOne(System.Drawing.Printing.PrintPageEventArgs e, int tblTop)
 		{
-            Table table = new Table(7);
-            table.Style = tableStyle; 
+			PrintAt(e, GetTabItemPos(0, 0, tblTop), "Prüflauf");
+			PrintAt(e, GetTabItemPos(0, 1, tblTop), "Q [l/h]");
+			PrintAt(e, GetTabItemPos(0, 2, tblTop), "Prüf-Vol.[l]");
+			PrintAt(e, GetTabItemPos(0, 3, tblTop), compound ? "HZ-Vol.[l]" : "Z-Vol.[l]");
+			PrintAt(e, GetTabItemPos(0, 4, tblTop), compound ? "NZ-Vol.[l]" : "-");
+			PrintAt(e, GetTabItemPos(0, 5, tblTop), "Fehler [%]");
+			PrintAt(e, GetTabItemPos(0, 6, tblTop), "Ergebnis");
 
-            string[] tableHeader = new string[]
-            {
-                "Prüflauf", 
-                "Q [l/h]", 
-                "Prüf-Vol.[l]",
-                compound ? "HZ-Vol.[l]" : "Z-Vol.[l]",
-                compound ? "NZ-Vol.[l]" : "-",
-                "Fehler [%]",
-                "Ergebnis",
-            };
-            table.AddRow(tableHeader, horizontalAlignment, verticalAlignment);
-
-            int rowCount = 0;
+			int rowCnt = 1;
 			foreach (var mtr in wm.MeterTestRslts) 
 			{
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
-                {
-                    if (from <= rowCount && rowCount <= to)
-                    {
-                        double flow_ctv = (mtr.TestRslt.TestTime != 0) ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime) : 0;
+				if (!compound || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
+				{
+					PrintAt(e, GetTabItemPos(rowCnt, 0, tblTop), mtr.Name());
+					PrintAt(e, GetTabItemPos(rowCnt, 1, tblTop), mtr.TestRslt.FlowMass.ToString("F1"));
+					PrintAt(e, GetTabItemPos(rowCnt, 2, tblTop), mtr.TestRslt.VolumeCTV.ToString("F2"));
+					if (compound)
+					{
+						Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
 
-                        if (compound)
-                        {
-                            Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
-                            Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
+						PrintAt(e, GetTabItemPos(rowCnt, 3, tblTop), mainMtr.VolumeMeter.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 4, tblTop), auxMtr.VolumeMeter.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 5, tblTop), mtr.Error.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 6, tblTop), mtr.Passed ? "iO" : "NiO");
+					}
+					else
+					{
+						PrintAt(e, GetTabItemPos(rowCnt, 3, tblTop), mtr.VolumeMeter.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 4, tblTop), "-");
+						PrintAt(e, GetTabItemPos(rowCnt, 5, tblTop), mtr.Error.ToString("F2"));
+						PrintAt(e, GetTabItemPos(rowCnt, 6, tblTop), mtr.Passed ? "iO" : "NiO");
+					}
 
-                            table.AddRow(new string[] { mtr.Name(),
-                                                    Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"),
-					                                mtr.TestRslt.VolumeCTV.ToString("F2"),
-						                            mainMtr.VolumeMeter.ToString("F2"),
-						                            auxMtr.VolumeMeter.ToString("F2"),
-						                            mtr.Error.ToString("F2"),
-						                            mtr.Passed ? "iO" : "NiO" },
-                                         horizontalAlignment,
-                                         verticalAlignment);
-                        }
-                        else
-                        {
-                            table.AddRow(new string[] { mtr.Name(),
-                                                    Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"),
-					                                mtr.TestRslt.VolumeCTV.ToString("F2"),
-                                                    mtr.VolumeMeter.ToString("F2"),
-						                            "-",
-						                            mtr.Error.ToString("F2"),
-						                            mtr.Passed ? "iO" : "NiO" },
-
-                                         horizontalAlignment,
-                                         verticalAlignment);
-                        }
-                    }
-                    rowCount++;
+                    rowCnt++;
 				}
 			}
-
-            return table;
 		}
 
-        /// <summary>
-        /// Prepares content and style of the second table.
-        /// </summary>
-        /// <param name="from">0-based index fo the first result to print</param>
-        /// <param name="to">0-based index fo the last result to print</param>
-        /// <returns>Prepared table</returns>
-        Table PrepareTableTwo(int from = 0, int to = int.MaxValue)
+		void PrintTableTwo(System.Drawing.Printing.PrintPageEventArgs e, int tblTop)
 		{
-            Table table = new Table(7);
-            table.Style = tableStyle;
+			PrintAt(e, GetTabItemPos(0, 1, tblTop), "Q [l/h]");
+			PrintAt(e, GetTabItemPos(0, 2, tblTop), "Temperatur");
+			PrintAt(e, GetTabItemPos(0, 3, tblTop), "Dichte");
+			PrintAt(e, GetTabItemPos(0, 4, tblTop), "Prüfzeit");
+			PrintAt(e, GetTabItemPos(0, 5, tblTop), "Druck Eing.");
+			PrintAt(e, GetTabItemPos(0, 6, tblTop), "Druck Ausg.");
 
-            string[] tableHeader = new string[]
-            {
-                "", 
-                "Q [l/h]", 
-                "Temperatur",
-                "Dichte",
-                "Prüfzeit",
-                "Druck Eing.",
-                "Druck Ausg.",
-            };
-            table.AddRow(tableHeader, horizontalAlignment, verticalAlignment);
-
-            int rowCount = 0;
+			int rowCnt = 1;
 			foreach (var mtr in wm.MeterTestRslts)
 			{
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
-                {
-                    if (from <= rowCount && rowCount <= to)
-                    {
-                        double flow_ctv = (mtr.TestRslt.TestTime != 0) ? (3.6 * mtr.TestRslt.VolumeCTV / mtr.TestRslt.TestTime) : 0;
+				if (!compound || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
+				{
+					Point p = GetTabItemPos(rowCnt, 0, tblTop);
+					PrintAt(e, p.X, p.Y, mtr.Name());
 
-                        table.AddRow(new string[] { mtr.Name(),
-                                                Config.Units.ConvertTo(Config.Unit.lph, flow_ctv).ToString("F1"),
-                                                mtr.TestRslt.TempDownMean.ToString("F2"),
-					                            mtr.TestRslt.DensityDiv.ToString("F2"),
-					                            mtr.TestTime.ToString("F1"),
-					                            Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"),
-					                            Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3") },
-                                     horizontalAlignment,
-                                     verticalAlignment);
-                    }
-                    rowCount++;
-                }
+					PrintAt(e, GetTabItemPos(rowCnt, 1, tblTop), mtr.TestRslt.FlowMass.ToString("F1"));
+					PrintAt(e, GetTabItemPos(rowCnt, 2, tblTop), mtr.TestRslt.TempDownMean.ToString("F2"));
+					PrintAt(e, GetTabItemPos(rowCnt, 3, tblTop), mtr.TestRslt.DensityDiv.ToString("F2"));
+					PrintAt(e, GetTabItemPos(rowCnt, 4, tblTop), mtr.TestTime.ToString("F1"));
+					PrintAt(e, GetTabItemPos(rowCnt, 5, tblTop), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressUpMean).ToString("F3"));
+					PrintAt(e, GetTabItemPos(rowCnt, 6, tblTop), Config.Units.ConvertTo(Config.Unit.bar, mtr.TestRslt.PressDownMean).ToString("F3"));
+
+					rowCnt++;
+				}
 			}
-
-            return table;
 		}
 
-        /// <summary>
-        /// Prints text on the top of the first page (title, common information).
-        /// </summary>
-        /// <param name="e"></param>
-        /// <param name="lineNr"></param>
-        /// <param name="wm"></param>
-        /// <param name="pruefvorlage"></param>
-        /// <param name="docVersion"></param>
-        void DrawCommonTop(PrintPageEventArgs e, ref int lineNr, Entities.WaterMeter wm, string pruefvorlage, string docVersion)
-        {
-            ///
-            /// 
-            ///
-            PrintAt(e, Tab1, lineNr * SpacingOne, docVersion);
-            lineNr++;
-            PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Prüfstand Nr :");
-            PrintBoldAt(e, Tab2, lineNr * SpacingOne, wm.BenchId().ToString());
-            PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Datum :");
-            PrintBoldAt(e, Tab4, lineNr * SpacingOne, wm.Batch.EndTime.Date.ToString("d"));
-            lineNr++;
-            PrintAt(e, Tab1, lineNr * SpacingOne, "Zählertyp :");
-            PrintAt(e, Tab2, lineNr * SpacingOne, zaehlertyp);
-            PrintAt(e, Tab3, lineNr * SpacingOne, "Eichjahr :");
-            PrintAt(e, Tab4, lineNr * SpacingOne, wm.YearOfProduction.ToString());
-            lineNr++;
-            PrintAt(e, Tab1, lineNr * SpacingOne, "Prüfvorlage :");
-            PrintAt(e, Tab2, lineNr * SpacingOne, pruefvorlage);
-            lineNr += 2;
+		/// <summary>
+		/// Draw table lines.
+		/// </summary>
+		void DrawTableFrame(System.Drawing.Printing.PrintPageEventArgs e, int rowsCount, int tblTop)
+		{
+			int t = tblTop;
+			int m = tblTop + SpacingOneAndHalf;
+			int b = tblTop + rowsCount * SpacingOneAndHalf;
 
-            if (compound)
-            {
-                PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler");
-                PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler");
-                lineNr++;
-            }
+			// Horizontal lines
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, t), new Point(747, t));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, m), new Point(747, m));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(80, b), new Point(747, b));
 
-            PrintAt(e, Tab1, lineNr * SpacingOne, "Hersteller :");
-            PrintAt(e, Tab2, lineNr * SpacingOne, wm.Producer());
-            if (compound)
-            {
-                PrintAt(e, Tab3, lineNr * SpacingOne, "Hersteller :");
-                PrintAt(e, Tab4, lineNr * SpacingOne, wm.ProducerAux());
-            }
-            lineNr++;
-
-            PrintAt(e, Tab1, lineNr * SpacingOne, "Seriennummer :");
-            PrintAt(e, Tab2, lineNr * SpacingOne, wm.SerialNr);
-            if (compound)
-            {
-                PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
-                PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
-            }
-            lineNr++;
-
-            PrintAt(e, Tab1, lineNr * SpacingOne, wm.NewQnames() ? "Q3 :" : "Qn :");
-            PrintAt(e, Tab2, lineNr * SpacingOne, wm.Q3_Qn().ToString());
-            if (compound)
-            {
-                PrintAt(e, Tab3, lineNr * SpacingOne, wm.NewQnames() ? "Q3 :" : "Qn :");
-                PrintAt(e, Tab4, lineNr * SpacingOne, wm.Q3_Qn_Aux().ToString());
-            }
-            lineNr++;
-
-            PrintAt(e, Tab1, lineNr * SpacingOne, "Zulassungszeichen :");
-            PrintAt(e, Tab2, lineNr * SpacingOne, wm.ApprovalInfo());
-            if (compound)
-            {
-                PrintAt(e, Tab3, lineNr * SpacingOne, "Zulassungszeichen :");
-                PrintAt(e, Tab4, lineNr * SpacingOne, wm.ApprovalInfoAux());
-            }
-            lineNr++;
-
-            PrintAt(e, Tab1, lineNr * SpacingOne, "Metr. klasse :");
-            PrintAt(e, Tab2, lineNr * SpacingOne, wm.MetrologicalClass());
-            if (compound)
-            {
-                PrintAt(e, Tab3, lineNr * SpacingOne, "Metr. klasse :");
-                PrintAt(e, Tab4, lineNr * SpacingOne, wm.MetrologicalClassAux());
-            }
-            lineNr++;
-
-            PrintAt(e, Tab1, lineNr * SpacingOne, "Stand :");
-            PrintAt(e, Tab2, lineNr * SpacingOne, wm.EndState);
-            if (compound)
-            {
-                PrintAt(e, Tab3, lineNr * SpacingOne, "Stand :");
-                PrintAt(e, Tab4, lineNr * SpacingOne, wm.EndStateAux);
-
-                lineNr += 2;
-                PrintAt(e, Tab1, lineNr * SpacingOne, "Umschaltpunkte :");
-                lineNr++;
-                PrintAt(e, Tab1, lineNr * SpacingOne, "Qsteig");
-                PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QRise).ToString("F1") + " l/h");
-                lineNr++;
-                PrintAt(e, Tab1, lineNr * SpacingOne, "Qfall");
-                PrintAt(e, Tab2, lineNr * SpacingOne, (1000.0 * wm.QFall).ToString("F1") + " l/h");
-            }
-        }
-
-        /// <summary>
-        /// Prints text at the bottom of the last page (footer).
-        /// </summary>
-        /// <param name="e"></param>
-        /// <param name="lineNr"></param>
-        /// <param name="wm"></param>
-        void DrawCommonBottom(PrintPageEventArgs e, float top, Entities.WaterMeter wm)
-        {
-            int iTop = (int)top;
-
-            PrintAt(e, Tab1, iTop, "Temperatur");
-            PrintAt(e, Tab2, iTop, wm.Batch.AmbTempMean().ToString("F1") + " \x00b0C");
-            
-            iTop += SpacingOne;
-            
-            PrintAt(e, Tab1, iTop, "Feuchtigkeit");
-            PrintAt(e, Tab2, iTop, wm.Batch.AmbHumiMean().ToString("F0") + " %");
-            
-            iTop += SpacingOne;
-            
-            PrintAt(e, Tab1, iTop, "Luftdruck");
-            PrintAt(e, Tab2, iTop, Config.Units.ConvertTo(Config.Unit.mbar, wm.Batch.AmbPressMean()).ToString("F0") + " mbar");
-
-            iTop += SpacingOne;
-
-            PrintAt(e, Tab3, iTop, wm.Batch.EndTime.Date.ToString("d"));
-
-            iTop += SpacingOne;
-            
-            PrintAt(e, Tab3, iTop, "Datum");
-            PrintAt(e, Tab4, iTop, "Unterschrift");
-        }
+			// Vertical lines
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point( 80, t), new Point( 80, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(267, t), new Point(267, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(347, t), new Point(347, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(427, t), new Point(427, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(507, t), new Point(507, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(587, t), new Point(587, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(667, t), new Point(667, b));
+			e.Graphics.DrawLine(new Pen(Color.Black, BorderW), new Point(747, t), new Point(747, b));
+		}
 
 
 		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
@@ -626,5 +434,18 @@ namespace Results.Output.Printers.Munich
             RectangleF printArea = new RectangleF(x, y, 667, SpacingOne);
             e.Graphics.DrawString(text, this.boldFont, Brushes.Black, printArea);
         }
+
+		/// <summary>
+		/// Get text position form a number of the test and a number of the parameter.
+		/// </summary>
+		/// <param name="row"></param>
+		/// <param name="column">Table column (0-based)</param>
+		/// <returns></returns>
+        Point GetTabItemPos(int row, int column, int tblTop)
+		{
+			int x = MarginLeft + ((column == 0) ? 80 : 187) + column * 80;	/// leftmost column is wider
+			int y = MarginTop + tblTop + (row * SpacingOneAndHalf) - 2;
+			return new Point(x, y);
+		}
 	}
 }

Results/Output/Printers/Table.cs

@@ -1,7 +1,4 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
@@ -28,7 +25,6 @@ namespace Results.Output.Printers
         public float LineWidth;
         public TableLines HorizLines;
         public TableLines VertLines;
-        public float[] ColumnWidths;        /// null = automatic
     }
 
     public class Table
@@ -61,21 +57,10 @@ namespace Results.Output.Printers
         }
 
 
-        /// <summary>
-        /// Returns true when table has either rows or columns count == 0
-        /// </summary>
-        /// <returns>true when empty</returns>
-        public bool IsEmpty()
-        {
-            return (Rows == null || RowsCount == 0 || Rows[0] == null || Rows[0].Length == 0);
-        }
-
-
         public SizeF Measure(System.Drawing.Printing.PrintPageEventArgs e)
         {
             SizeF retVal = new SizeF(0, 0);
-
-            if (IsEmpty()) return retVal;       /// Empty table => zero Size
+            if (RowsCount == 0) return retVal;
 
             float[] columnWidth = new float[ColumnsCount];
             float[] rowHeight = new float[RowsCount];
@@ -132,10 +117,10 @@ namespace Results.Output.Printers
 
         public float Draw(System.Drawing.Printing.PrintPageEventArgs e, float left, float top)
         {
-            if (IsEmpty()) return top;          /// Empty table
+            if (RowsCount == 0) return top;
 
             int tblColumnsCount = Rows[0].Length;
-
+            
             float[] columnWidth = new float[tblColumnsCount];
             float[] columnPos = new float[tblColumnsCount];
             float[] vertLinePos = new float[tblColumnsCount + 1];
@@ -158,10 +143,6 @@ namespace Results.Output.Printers
                         /// In not a separator line
                         bool isHeader = (colIx < Style.LeftHeadersCount) || (rowIx < Style.TopHeadersCount);
                         SizeF size = PrintersCommon.Measure(e, Rows[rowIx][colIx], isHeader ? Style.HeaderFont : Style.Font);
-                        if ((Style.ColumnWidths != null) && (Style.ColumnWidths.Length > colIx))
-                        {
-                            size.Width = Style.ColumnWidths[colIx]; /// Override measurement if column width is defined
-                        }
                         if (size.Width > columnWidth[colIx]) columnWidth[colIx] = size.Width;
                         if (size.Height > rowHeight[rowIx]) rowHeight[rowIx] = size.Height;
                     }

Results/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("2.18.1142.0")]
-[assembly: AssemblyFileVersion("2.18.1142.0")]
+[assembly: AssemblyVersion("2.18.893.0")]
+[assembly: AssemblyFileVersion("2.18.893.0")]

Results/Resources/Strings.Designer.cs

@@ -69,15 +69,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Address.
-        /// </summary>
-        internal static string Address {
-            get {
-                return ResourceManager.GetString("Address", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Alignment.
         /// </summary>
@@ -114,15 +105,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Batch.
-        /// </summary>
-        internal static string Batch {
-            get {
-                return ResourceManager.GetString("Batch", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Batch nr..
         /// </summary>
@@ -141,24 +123,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Bench ID.
-        /// </summary>
-        internal static string Bench_ID {
-            get {
-                return ResourceManager.GetString("Bench_ID", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Bench name.
-        /// </summary>
-        internal static string Bench_name {
-            get {
-                return ResourceManager.GetString("Bench_name", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Cancel.
         /// </summary>
@@ -672,15 +636,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Procedure description.
-        /// </summary>
-        internal static string Procedure_description {
-            get {
-                return ResourceManager.GetString("Procedure_description", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Producer.
         /// </summary>
@@ -798,15 +753,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to repetition.
-        /// </summary>
-        internal static string repetition {
-            get {
-                return ResourceManager.GetString("repetition", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Result.
         /// </summary>
@@ -1077,15 +1023,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Relative error of a meter in previous test/in production.
-        /// </summary>
-        internal static string Tooltip_E_rel_last {
-            get {
-                return ResourceManager.GetString("Tooltip_E_rel_last", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Relative error of the master meter.
         /// </summary>
@@ -1366,7 +1303,7 @@ namespace Results.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Flow measured by the reference flow meter.
+        ///   Looks up a localized string similar to Flow calculated from conventional true volume and the time.
         /// </summary>
         internal static string Tooltip_Q_v_r {
             get {

Results/Resources/Strings.cs.resx

@@ -213,49 +213,4 @@
   <data name="Unit" xml:space="preserve">
     <value>Jednotka</value>
   </data>
-  <data name="Approval" xml:space="preserve">
-    <value>Schválení</value>
-  </data>
-  <data name="Bench" xml:space="preserve">
-    <value>Stanice</value>
-  </data>
-  <data name="Density" xml:space="preserve">
-    <value>Hustota</value>
-  </data>
-  <data name="Density_correction" xml:space="preserve">
-    <value>Korekce hustoty</value>
-  </data>
-  <data name="End" xml:space="preserve">
-    <value>Konec</value>
-  </data>
-  <data name="Procedure" xml:space="preserve">
-    <value>Procedura</value>
-  </data>
-  <data name="Procedure_description" xml:space="preserve">
-    <value>Popis procedury</value>
-  </data>
-  <data name="Start" xml:space="preserve">
-    <value>Začátek</value>
-  </data>
-  <data name="User" xml:space="preserve">
-    <value>Uživatel</value>
-  </data>
-  <data name="User_description" xml:space="preserve">
-    <value>Popis uživatele</value>
-  </data>
-  <data name="Bench_ID" xml:space="preserve">
-    <value>ID stanice</value>
-  </data>
-  <data name="Bench_name" xml:space="preserve">
-    <value>Jméno stanice</value>
-  </data>
-  <data name="Address" xml:space="preserve">
-    <value>Adresa</value>
-  </data>
-  <data name="Batch" xml:space="preserve">
-    <value>Dávka</value>
-  </data>
-  <data name="repetition" xml:space="preserve">
-    <value>opakování</value>
-  </data>
 </root>

Results/Resources/Strings.resx

@@ -514,7 +514,7 @@
     <value>Flow obtained from the master meter - mean</value>
   </data>
   <data name="Tooltip_Q_v_r" xml:space="preserve">
-    <value>Flow measured by the reference flow meter</value>
+    <value>Flow calculated from conventional true volume and the time</value>
   </data>
   <data name="Tooltip_T_di_ac" xml:space="preserve">
     <value>Actual temperature at the diverter</value>
@@ -723,25 +723,4 @@
   <data name="Unit" xml:space="preserve">
     <value>Unit</value>
   </data>
-  <data name="Procedure_description" xml:space="preserve">
-    <value>Procedure description</value>
-  </data>
-  <data name="Bench_ID" xml:space="preserve">
-    <value>Bench ID</value>
-  </data>
-  <data name="Bench_name" xml:space="preserve">
-    <value>Bench name</value>
-  </data>
-  <data name="Address" xml:space="preserve">
-    <value>Address</value>
-  </data>
-  <data name="Tooltip_E_rel_last" xml:space="preserve">
-    <value>Relative error of a meter in previous test/in production</value>
-  </data>
-  <data name="Batch" xml:space="preserve">
-    <value>Batch</value>
-  </data>
-  <data name="repetition" xml:space="preserve">
-    <value>repetition</value>
-  </data>
 </root>

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SENTEC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
+    <DefineConstants>TRACE;SENTEC</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -77,15 +77,6 @@
     <Compile Include="Forms\ListViewEx.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Forms\ListViewExtensions.cs" />
-    <Compile Include="Forms\LviIntColumnComparer.cs" />
-    <Compile Include="Forms\LviTextColumnComparer.cs" />
-    <Compile Include="Forms\OneWMResultsCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\OneWMResultsCtrl.Designer.cs">
-      <DependentUpon>OneWMResultsCtrl.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\ResultsConfigCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -110,10 +101,6 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Output\Printers\Enhanced\EnhancedPrinterCfg.cs" />
-    <Compile Include="Output\Printers\Label\LabelPrintDocument.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Output\Printers\Label\LabelPrinterCfg.cs" />
     <Compile Include="Output\Printers\PrintersCommon.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -165,9 +152,6 @@
     <EmbeddedResource Include="Forms\ListViewEx.resx">
       <DependentUpon>ListViewEx.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\OneWMResultsCtrl.resx">
-      <DependentUpon>OneWMResultsCtrl.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\ResultsConfigCtrl.resx">
       <DependentUpon>ResultsConfigCtrl.cs</DependentUpon>
     </EmbeddedResource>

Results/Utils.cs

@@ -31,21 +31,6 @@ namespace Results
             }
         }
 
-        public static string BenchNameFromOracleBenchID(int id)
-        {
-            switch (id)
-            {
-                case 4: return "WR9";
-                case 5: return "WR10";
-                case 6: return "WR11";
-                case 7: return "PT7";
-                case 8: return "WR13";
-                case 9: return "WR15";
-                case 10: return "WR14";
-                default: return string.Empty;
-            }
-        }
-
 
         /// <summary>
         /// Converts ErrorFlags integer to string. Supports up to 31 flags (E1..E31).
@@ -69,9 +54,9 @@ namespace Results
 
         public static string PassedColorStr(bool passed, bool useRedGreenColor)
         {
-#if PUCHONG_200
+#if PUCHONG_PT200
             return (useRedGreenColor) ? (passed ? "OK|Green" : "NG|Red")         : (passed ? "OK|White" : "NG|White");
-#elif BAHRAIN_50 || DUBAJ_50
+#elif BAHRAIN_50
             return (useRedGreenColor) ? (passed ? "PASSED|Green" : "FAILED|Red") : (passed ? "PASSED|White" : "FAILED|White");
 #elif LANG_PL
 			return (useRedGreenColor) ? (passed ? "+|Green" : "-|Red")           : (passed ? "+|White" : "-|White");

Results/WMeterRsltItemSpec.cs

@@ -132,10 +132,7 @@ namespace Results
 		/// Static list of all available items
         public static readonly IList<WMeterRsltItemSpec> AllItems;
 
-        /// <summary>
-        /// Initializes the <see cref="WMeterRsltItemSpec"/> class.
-        /// </summary>
-        /// Static constructor that initializes the list of all items
+		/// Static constructor that initializes the list of all items
         static WMeterRsltItemSpec()
 		{
             AllItems = new List<WMeterRsltItemSpec>();
@@ -144,27 +141,25 @@ namespace Results
             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_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.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())));
 
             ///
             /// 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.Volume,            string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
+            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) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeRef)));
+            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).VolumeMeter)));
+            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).VolumeMeter)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
+            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).VolumeStart)));
+            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).VolumeStart)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.End_volume,        Strings.End_volume + "()",                                                Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeEnd)));
+            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).VolumeEnd)));
+            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).VolumeEnd)));
 
 			///
 			/// Mass
@@ -192,15 +187,15 @@ namespace Results
             ///
             /// 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, "V3", w.GetTestRslt(t).TestTime)));
-            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, "V3", 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.Test_time,              Strings.T_s + "()",                                    Quantity.Time, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V3", w.GetTestRslt(t).IsPMaxTest() ? 0 : w.GetTestRslt(t).TestTime)));
+            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).IsPMaxTest()) ? "" : FormatDbl(u, f, p, "V3", w.GetMeterTestRslt(t).TestTime)));
+            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, "V3", 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) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).IsDiverter() ? w.GetTestRslt(t).DiverterStart : 0)));
+            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) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).IsDiverter() ? w.GetTestRslt(t).DiverterEnd : 0)));
+            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) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).IsStartStop() ? w.GetTestRslt(t).DiverterStart : 0)));
+            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) ? "" : FormatDbl(u, f, p, "F3", w.GetTestRslt(t).IsStartStop() ? w.GetTestRslt(t).DiverterEnd : 0)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Timestamp_start,        "Timestamp start ()",                                  Quantity.Time, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : 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) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).TimestampEnd)));
 
             ///
             /// Flow
@@ -214,7 +209,7 @@ namespace Results
             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.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, "V3", (w.GetTestRslt(t).TestTime == 0) ? 0 : 3.6 * w.GetTestRslt(t).VolumeCTV / w.GetTestRslt(t).TestTime)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_ctv,    string.Format("{0} ctv min ()", Strings.VName_Flow), "Mean 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).TestTime == 0) ? 0 : w.GetTestRslt(t).VolumeCTV / w.GetTestRslt(t).TestTime)));
             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)));
@@ -309,16 +304,12 @@ namespace Results
             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).Uncertainty())));
             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", Config.Formulas.ErrorFromVolumes(w.GetTestRslt(t).ConstMasterCorr, w.GetTestRslt(t).ConstMaster))));
-#if ORACLE_DB
+#if TURA_IPERL || TURA_SPECIAL
             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)));
 #endif
-            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.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr() : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr())));
 
             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
 
@@ -372,22 +363,16 @@ namespace Results
             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.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)));
+			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)));
             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.Test_bench_ID,       Strings.Bench,               Quantity.String,      ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.Batch.TestBenchId.ToString())));
+			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, Users.Entities.User.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, Users.Entities.User.EncodedStrToFullName(w.Batch.UserName))));
@@ -402,55 +387,30 @@ namespace Results
             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.Result_code, Strings.Result_code, Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ResultCode)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark,      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))));
 
 #if HEAT_METERS
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,           Strings.Energy + " ()",       Quantity.Energy, ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.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, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.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, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.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, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.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, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : FormatDbl(u, f, p, "F1", (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter))));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy,    Strings.Energy_ref + "()",  Quantity.Energy,        ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) == null) ? "" : FormatDbl(u, f, p, "F1", (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef))));
 #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.Q2CorrectionDone ? 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))));
-  #endif
+            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.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.Q2CorrectionDone ? Strings.Yes : Strings.No)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrRFlow, "iPerl Q2CorrRFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRFlow)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow, "iPerl Q2CorrLFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrLFlow)));
+            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)));
 #endif
-
-#if TURA_SPECIAL
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_AssignedSerialNr, "iPerl assigned s/n",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.AssignedSerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_CompleteSerialNr, "iPerl complete s/n",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.CompleteSerialNr)));
-            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.E1,  "E1 ()",  Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0001) != 0) ? Strings.Yes : Strings.No));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone, Strings.Test_done + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null && w.GetMeterTestRslt(t).TestDone) ? Strings.Yes : Strings.No));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed, Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null && w.GetMeterTestRslt(t).Passed) ? Strings.Yes : Strings.No));
+			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.E1, "E1 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0001) != 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 & 0x0002) != 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 & 0x0004) != 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 & 0x0008) != 0) ? Strings.Yes : Strings.No));
@@ -467,7 +427,6 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.E15, "E15 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x4000) != 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 & 0x8000) != 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 & 0x100000) != 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)));
@@ -481,43 +440,12 @@ namespace Results
 
         public static string FormatStr(string format, string value)
         {
-            string valueEx = string.IsNullOrEmpty(value) ? string.Empty : value;
-            return  string.IsNullOrEmpty(format) ? valueEx : string.Format(format, valueEx);
-        }
-
-        public static string FormatBool(string format, bool value)
-        {
-            if (string.IsNullOrEmpty(format))
-            {
-                return  value ? Strings.Yes : Strings.No;
-            }
-            else
-            {
-                string[] yesNo = format.Split(new char[] { '~' });
-                return value ? yesNo[0] : ((yesNo.Length >= 2) ? yesNo[1] : Strings.No);
-            }
-        }
-
-        public static string FormatEnum(string format, int value)
-        {
-            if (string.IsNullOrEmpty(format))
-            {
-                return value.ToString();
-            }
-            else
-            {
-                string[] texts = format.Split(new char[] { '~' });
-
-                if (value >= 0 && value < texts.Length)
-                    return texts[value];
-                else
-                    return value.ToString();
-            }
+            return  string.IsNullOrEmpty(format) ? value : string.Format(format, value);
         }
 
         public static string FormatInt(string format, int value)
         {
-            return string.IsNullOrEmpty(format) ? value.ToString() : string.Format(format, value);
+            return  string.IsNullOrEmpty(format) ? value.ToString() : string.Format(format, value);
         }
 
         public static string FormatDbl(Config.Unit units, string format, string precisionOrEmpty, string dfltPrecision, double v)

ResultsBrowser/Filters/BatchNrFilter.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Windows.Forms;
-using System.Xml.Serialization;
-using NHibernate;
-using Results.Entities;
-
-namespace ResultsBrowser.Filters
-{
-    public class BatchNrFilter : IFilter
-    {
-        public static string GetFilterID() { return "BatchNr"; }
-        public static string GetFilterName() { return "Batch number"; }
-
-        ///
-        /// Obligatory wrappers
-        ///
-        public string GetThisFilterID() { return GetFilterID(); }
-        public void Save(StringBuilder sb) { (new XmlSerializer(this.GetType())).Serialize(new StringWriter(sb), this); }
-        public void Data2UI() { userIface.Data2UI(); }
-        public void UI2Data() { userIface.UI2Data(); }
-        public UserControl GetFilterUI() { return userIface as UserControl; }
-
-        ///
-        /// Serialized filter data
-        ///
-        public int BatchNr;
-
-
-        private BatchNrFilterUI userIface;
-
-        public BatchNrFilter()
-        {
-            userIface = new BatchNrFilterUI(this);
-        }
-
-        public IList<WaterMeter> ExecuteQuery(ISession[] sessions, IList<WaterMeter> waterMeters)
-        {
-            IList<WaterMeter> filteredWaterMeters = new List<WaterMeter>();
-
-            if (waterMeters == null)
-            {
-                foreach (var se in sessions)
-                {
-                    IList<WaterMeter> wms = se.QueryOver<WaterMeter>().List<WaterMeter>();
-
-                    foreach (var wm in wms)
-                    {
-                        if (wm.BatchNr() == BatchNr) filteredWaterMeters.Add(wm);
-                    }
-                }
-            }
-            else
-            {
-                foreach (var wm in waterMeters)
-                {
-                    if (wm.BatchNr() == BatchNr) filteredWaterMeters.Add(wm);
-                }
-            }
-
-            return filteredWaterMeters;
-        }
-    }
-}

ResultsBrowser/Filters/BatchNrFilterUI.Designer.cs

@@ -1,72 +0,0 @@
-namespace ResultsBrowser.Filters
-{
-    partial class BatchNrFilterUI
-    {
-        /// <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 Component 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.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.batchNrTextBox = new System.Windows.Forms.TextBox();
-            this.groupBox1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.batchNrTextBox);
-            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(835, 40);
-            this.groupBox1.TabIndex = 0;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Batch number";
-            // 
-            // batchNrTextBox
-            // 
-            this.batchNrTextBox.Location = new System.Drawing.Point(132, 13);
-            this.batchNrTextBox.Name = "batchNrTextBox";
-            this.batchNrTextBox.Size = new System.Drawing.Size(80, 20);
-            this.batchNrTextBox.TabIndex = 0;
-            // 
-            // BatchNrFilterUI
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupBox1);
-            this.Name = "BatchNrFilterUI";
-            this.Size = new System.Drawing.Size(835, 40);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.TextBox batchNrTextBox;
-    }
-}

ResultsBrowser/Filters/BatchNrFilterUI.cs

@@ -1,39 +0,0 @@
-using System.Windows.Forms;
-
-namespace ResultsBrowser.Filters
-{
-    public partial class BatchNrFilterUI : UserControl
-    {
-        BatchNrFilter data;
-
-        /// <summary> Used only by Designer </summary>
-        public BatchNrFilterUI()
-        {
-            InitializeComponent();
-            Localize();
-        }
-
-        /// <summary> Used to create the control aby a filter </summary>
-        public BatchNrFilterUI(BatchNrFilter data)
-        {
-            this.data = data;
-            InitializeComponent();
-            Localize();
-        }
-
-        void Localize()
-        {
-            groupBox1.Text = BatchNrFilter.GetFilterName();
-        }
-
-		public void Data2UI()
-		{
-            batchNrTextBox.Text = data.BatchNr.ToString();
-		}
-
-		public void UI2Data()
-		{
-            data.BatchNr = int.Parse(batchNrTextBox.Text);
-		}
-	}
-}

ResultsBrowser/Filters/BatchNrQnFilterUI.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : 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">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <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="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <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="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">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <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>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ResultsBrowser/Filters/Factory.cs

@@ -18,23 +18,19 @@ namespace ResultsBrowser.Filters
             IDs = new string[]
                 {
                     DateFilter.GetFilterID(),
-                    BatchNrFilter.GetFilterID(),
                     ProcedureFilter.GetFilterID(),
                     ProtocolFilter.GetFilterID(),
                     QnFilter.GetFilterID(),
                     SerialNrFilter.GetFilterID(),
-                    WMPositionFilter.GetFilterID(),
                 };
 
             Names = new string[]
                 {
                     DateFilter.GetFilterName(),
-                    BatchNrFilter.GetFilterName(),
                     ProcedureFilter.GetFilterName(),
                     ProtocolFilter.GetFilterName(),
                     QnFilter.GetFilterName(),
                     SerialNrFilter.GetFilterName(),
-                    WMPositionFilter.GetFilterName(),
                 };
 
             Count = IDs.Length;
@@ -43,13 +39,11 @@ namespace ResultsBrowser.Filters
 
         public static IFilter GetFilter(string filterID)
         {
-            if (filterID == DateFilter.GetFilterID())            return new DateFilter();
-            else if (filterID == BatchNrFilter.GetFilterID())    return new BatchNrFilter();
-            else if (filterID == ProcedureFilter.GetFilterID())  return new ProcedureFilter();
-            else if (filterID == ProtocolFilter.GetFilterID())   return new ProtocolFilter();
-            else if (filterID == QnFilter.GetFilterID())         return new QnFilter();
-            else if (filterID == SerialNrFilter.GetFilterID())   return new SerialNrFilter();
-            else if (filterID == WMPositionFilter.GetFilterID()) return new WMPositionFilter();
+			if      (filterID == DateFilter.GetFilterID())      return new DateFilter();
+            else if (filterID == ProcedureFilter.GetFilterID()) return new ProcedureFilter();
+            else if (filterID == ProtocolFilter.GetFilterID())  return new ProtocolFilter();
+            else if (filterID == QnFilter.GetFilterID())        return new QnFilter();
+            else if (filterID == SerialNrFilter.GetFilterID())  return new SerialNrFilter();
             else return null;
         }
 
@@ -59,13 +53,11 @@ namespace ResultsBrowser.Filters
 			try
 			{
                 Type type;
-                if (filterID == DateFilter.GetFilterID())            type = typeof(DateFilter);
-                else if (filterID == BatchNrFilter.GetFilterID())    type = typeof(BatchNrFilter);
-                else if (filterID == ProcedureFilter.GetFilterID())  type = typeof(ProcedureFilter);
-                else if (filterID == ProtocolFilter.GetFilterID())   type = typeof(ProtocolFilter);
-                else if (filterID == QnFilter.GetFilterID())         type = typeof(QnFilter);
-                else if (filterID == SerialNrFilter.GetFilterID())   type = typeof(SerialNrFilter);
-                else if (filterID == WMPositionFilter.GetFilterID()) type = typeof(WMPositionFilter);
+                if      (filterID == DateFilter.GetFilterID())      type = typeof(DateFilter);
+                else if (filterID == ProcedureFilter.GetFilterID()) type = typeof(ProcedureFilter);
+                else if (filterID == ProtocolFilter.GetFilterID())  type = typeof(ProtocolFilter);
+                else if (filterID == QnFilter.GetFilterID())        type = typeof(QnFilter);
+                else if (filterID == SerialNrFilter.GetFilterID())  type = typeof(SerialNrFilter);
                 else return null;
 
                 IFilter filter = (new XmlSerializer(type)).Deserialize(new StringReader(serializedText)) as IFilter;

ResultsBrowser/Filters/ProcedureFilterUI.Designer.cs

@@ -48,15 +48,15 @@
             // 
             this.procedureTextBox.Location = new System.Drawing.Point(132, 13);
             this.procedureTextBox.Name = "procedureTextBox";
-            this.procedureTextBox.Size = new System.Drawing.Size(360, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(138, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // ProcedureFilterUI
+            // ProcedureFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "ProcedureFilterUI";
+            this.Name = "ProcedureFilter";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/QnFilterUI.Designer.cs

@@ -48,15 +48,15 @@
             // 
             this.procedureTextBox.Location = new System.Drawing.Point(132, 13);
             this.procedureTextBox.Name = "procedureTextBox";
-            this.procedureTextBox.Size = new System.Drawing.Size(80, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(138, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // QnFilterUI
+            // QnFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "QnFilterUI";
+            this.Name = "QnFilter";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/SerialNrFilter.cs

@@ -30,6 +30,7 @@ namespace ResultsBrowser.Filters
         ///
         public string SerialNr;
 
+
         private SerialNrFilterUI userIface;
 
         public SerialNrFilter()
@@ -41,50 +42,21 @@ namespace ResultsBrowser.Filters
         {
             IList<WaterMeter> filteredWaterMeters = new List<WaterMeter>();
 
-            if (string.IsNullOrEmpty(SerialNr)) return filteredWaterMeters;     /// Empty s/n => Return an empty list of WM-s
-
-            IList<string> serialNumbers = new List<string>();
-            ///
-            if (SerialNr[0] == '@')
-            {
-                try
-                {
-                    TextReader rdr = new StreamReader(SerialNr.Substring(1));
-                    string line = rdr.ReadLine();
-                    while (!string.IsNullOrEmpty(line))
-                    {
-                        serialNumbers.Add(line);
-                        line = rdr.ReadLine();
-                    }
-                }
-                catch (Exception)
-                {
-                    return filteredWaterMeters;
-                }
-            }
-            else
-            {
-                serialNumbers.Add(SerialNr);
-            }
-
             if (waterMeters == null)
             {
                 foreach (var se in sessions)
                 {
-                    foreach (var oneSerialNr in serialNumbers)
-                    {
-                        IList<WaterMeter> wms = se.QueryOver<WaterMeter>()
-                                                  .Where(x => (x.SerialNr == oneSerialNr))
-                                                  .List<WaterMeter>();
-                        foreach (var wm in wms) filteredWaterMeters.Add(wm);
-                    }
+                    IList<WaterMeter> wms = se.QueryOver<WaterMeter>()
+                                              .Where(x => (x.SerialNr == SerialNr))
+                                              .List<WaterMeter>();
+                    foreach (var wm in wms) filteredWaterMeters.Add(wm);
                 }
             }
             else
             {
                 foreach (var wm in waterMeters)
                 {
-                    if (serialNumbers.Contains(wm.SerialNr)) filteredWaterMeters.Add(wm);
+                    if (wm.SerialNr == SerialNr) filteredWaterMeters.Add(wm);
                 }
             }
 

ResultsBrowser/Filters/SerialNrFilterUI.Designer.cs

@@ -48,16 +48,15 @@
             // 
             this.serialNrTextBox.Location = new System.Drawing.Point(132, 13);
             this.serialNrTextBox.Name = "serialNrTextBox";
-            this.serialNrTextBox.Size = new System.Drawing.Size(360, 20);
+            this.serialNrTextBox.Size = new System.Drawing.Size(138, 20);
             this.serialNrTextBox.TabIndex = 0;
-            this.serialNrTextBox.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.serialNrTextBox_MouseDoubleClick);
             // 
-            // SerialNrFilterUI
+            // SerialNrFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "SerialNrFilterUI";
+            this.Name = "SerialNrFilter";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();