Reconfigured for Torino PT50

.gitignore

@@ -14,6 +14,8 @@ 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;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TORINO_50;LANG_IT</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;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;TORINO_50;LANG_IT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -78,6 +78,7 @@
     <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

@@ -20,7 +20,7 @@ namespace Config
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif FUZHOU_300 || FUZHOU_150 || PT200IL || PUCHONG_200 || GENESIS || SLM_150 || PETERSBURG_200
+#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || PUCHONG_200 || GENESIS || SLM_150 || PETERSBURG_200
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 3;
@@ -32,6 +32,12 @@ namespace Config
 		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;
@@ -44,7 +50,7 @@ namespace Config
 		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 || ZAMBIA || FEWA_50
+#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
         public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;

Config/Entities/Enums.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -58,7 +58,7 @@ namespace Config.Entities
         [Description("Remote DB only")]         RemoteDBOnly,
         [Description("Both DB-s, local 1st")]   BothDBsLocalFirst,
         [Description("Both DB-s, remote 1st")]  BothDBsRemoteFirst,
-        Count,
+        Count
     }
 
     /// <summary>
@@ -224,6 +224,14 @@ 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

@@ -60,7 +60,11 @@ namespace Config.Entities
 		/// <param name="strValue">String representation of the parameter</param>
         CfgUpdateFlags UpdateParam(int ix, string strValue);
 
-		void UpdateEmbeddedDbEntity();
+        /// <summary>
+        /// Updates DB entities for related parameters
+        /// </summary>
+        /// <returns>true when successful</returns>
+        bool UpdateEmbeddedDbEntity();
 
         /// <summary>
         /// Creates an object copy

Config/Entities/IperlEnums.cs

@@ -0,0 +1,36 @@
+///
+/// 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 OptoHeadState
+    {
+        Disabled,
+        OptoAndDirOK,
+        OptoNok,
+        DirNok,
+        Count
+    }
+}

Config/Entities/MeasurementCorrection.cs

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

Config/Entities/Test.cs

@@ -358,6 +358,40 @@ namespace Config.Entities
             }
         }
 
+		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/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.982.0")]
-[assembly: AssemblyFileVersion("2.18.982.0")]
+[assembly: AssemblyVersion("2.18.1110.0")]
+[assembly: AssemblyFileVersion("2.18.1110.0")]

Config/Utils.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,7 +12,21 @@ namespace Config
     {
         public static string SignificantDigitsToFmt(double value, int sigDigits)
         {
-            if (sigDigits == 5)
+            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 (value >= 9999.5 || value < -9999.5) return "F0";
                 else if (value >= 999.95 || value < -999.95) return "F1";

DeviceTest/DeviceTestDlg.cs

@@ -56,7 +56,10 @@ namespace DeviceTest
 
 
 		static TBF.Boxes.FloatBox floatBox;
-		static Event evnt;
+        static TBF.Boxes.DoubleBox dblBox1;
+        static TBF.Boxes.DoubleBox dblBox2;
+        static TBF.Boxes.DoubleBox dblBox3;
+        static Event evnt;
 
 
 		static DeviceTestDlg()
@@ -657,7 +660,12 @@ 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.TankSelector.TankSelector)
+            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)
 			{
 				//operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
 				//operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
@@ -681,10 +689,15 @@ namespace DeviceTest
 			}
 			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation21 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation22 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-			else if (tbfComponent2forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            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)
 			{
 				//operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
                 //operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
@@ -708,10 +721,15 @@ namespace DeviceTest
 			}
 			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
 			{
-				operation31 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
-				operation32 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+				operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
+				operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
 			}
-			else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
+            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)
 			{
 				//operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
 				//operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
@@ -720,11 +738,14 @@ namespace DeviceTest
 			}
 
 
-			while (workerThreadRunning)
+            int time = 0;
+            while (workerThreadRunning)
 			{
 				Thread.Sleep(1000);
 
-				if (workerThreadRunning)
+                StateMachine.Time = ++time;
+
+                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(LocAppDataDir + log4netConfigFName));
+			log4net.Config.XmlConfigurator.Configure(new System.IO.FileInfo(Path.Combine(LocAppDataDir, log4netConfigFName)));
 			log = LogManager.GetLogger(typeof(Program));
 			log.Fatal("--------------------------------------------------------------------------------");
-			log.Fatal(string.Format("TBF ver.{0}", Version));
+			log.FatalFormat("DeviceTest ver.{0}", Version);
 
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);

Results/BatchResults.cs

@@ -96,7 +96,7 @@ namespace Results
 						{
 							if (d.WaterMeters[i] == null) continue;
 
-							if (t.Part != 0 && waterMeterParts[i] != 0 && t.Part != waterMeterParts[i]) continue;
+							if (!t.IsPartCompatible(waterMeterParts[i])) continue;
 
 							///
 							/// Create empty watermeter test results and add them to the list and to dictionaries

Results/Entities/MeterTestRslt.cs

@@ -28,6 +28,9 @@ 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
@@ -80,10 +83,18 @@ 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()
+        public virtual string PassedColorStr(string yesNoFormatOrEmpty)
         {
-            return Utils.PassedColorStr(Passed, Evaluate());
-		}
+            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);
+            }
+        }
 
         public MeterTestRslt()
         {

Results/Entities/TestRslt.cs

@@ -25,7 +25,8 @@ 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; }
+		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.
@@ -318,6 +319,18 @@ 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

@@ -60,13 +60,13 @@ namespace Results.Entities
 		public virtual int    SerialNrEx        { get; set; }	/// Aux s/n for compound meters, Serial number for iPerl water meter
 		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 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 bool   Q2CorrectionDone  { get; set; }   /// true = iPerl Q2 correction was done
         public virtual double Q2Correction      { get; set; }	/// !!! obsolete
-        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    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    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
@@ -151,7 +151,7 @@ namespace Results.Entities
         {
             ErrorFlagsMode errorFlagsMode;
             string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode));
-            return string.IsNullOrEmpty(eFlags) ? (WaterMeterData.Text4 + PassedColorStr()) : eFlags;
+            return string.IsNullOrEmpty(eFlags) ? (WaterMeterData.Text4 + PassedColorStr(null)) : eFlags;
         }
 
         /// <summary>
@@ -211,9 +211,17 @@ namespace Results.Entities
         }
 
 
-        public virtual string PassedColorStr()
+        public virtual string PassedColorStr(string yesNoFormatOrEmpty)
         {
-            return Utils.PassedColorStr(Passed, true);
+            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);
+            }
         }
 
 
@@ -344,8 +352,8 @@ namespace Results.Entities
 		    Q2ErrWOCorrection = src.Q2ErrWOCorrection;
 		    Q2CorrectionDone = src.Q2CorrectionDone;
             Q2Correction = src.Q2Correction;
-            Q2CorrRFlow = src.Q2CorrRFlow;
-            Q2CorrLFlow = src.Q2CorrLFlow;
+            Q2CorrRL = src.Q2CorrRL;
+            Q2CorrLR = src.Q2CorrLR;
             Q2CorrFlowRight = src.Q2CorrFlowRight;
 		    Diff2Hz8Hz = src.Diff2Hz8Hz;
 		    Hz2CorrectionDone = src.Hz2CorrectionDone;

Results/ItemID.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2017 Sensus Metering Systems
+/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
 ///
 using System;
 
@@ -261,6 +261,16 @@ namespace Results
         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
+                                        
         Count,
     }
 }

Results/Mappings/MeterTestRsltMap.cs

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

Results/Mappings/WaterMeterMap.cs

@@ -31,24 +31,24 @@ namespace Results.Mappings
 			Map(x => x.SerialNrEx);
 			Map(x => x.OrigCalibFactor);
 			Map(x => x.CalibFactor);
-#endif
-#if IPERL2
             Map(x => x.OrigCalibFactorLNA);
             Map(x => x.CalibFactorLNA);
-#endif
-#if IPERL
             Map(x => x.Q2ErrWOCorrection);
 			Map(x => x.Q2CorrectionDone);
 			Map(x => x.Q2Correction);
-            Map(x => x.Q2CorrRFlow);
-            Map(x => x.Q2CorrLFlow);
+            Map(x => x.Q2CorrRL).Column("Q2CorrRFlow");
+            Map(x => x.Q2CorrLR).Column("Q2CorrLFlow");
             Map(x => x.Q2CorrFlowRight);
 			Map(x => x.Diff2Hz8Hz);
 			Map(x => x.Hz2CorrectionDone);
 			Map(x => x.Hz2Correction);
 			Map(x => x.FWVersion);
 #endif
-			References(x => x.WaterMeterData);
+#if ORACLE_DB
+            Map(x => x.Pruefindex);
+            Map(x => x.HydrPruefung);
+#endif
+            References(x => x.WaterMeterData);
 			References(x => x.Batch);
 			HasMany(x => x.MeterTestRslts)
 				.Cascade.All();

Results/Output/Printers/Label/LabelPrintDocument.cs

@@ -0,0 +1,98 @@
+///
+/// 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

@@ -0,0 +1,21 @@
+///
+/// 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,11 +1,13 @@
 ///
-/// Copyright (c) 2016-2017 Sensus Metering Systems
+/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
 ///
 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
 {
@@ -38,11 +40,16 @@ namespace Results.Output.Printers.Munich
         readonly int resultsCount;
 		readonly bool compound;			/// true when MetersKind is MetersKind.Combined												
 										
-		/// Top coordinate of the table
-		int nrPages;
-		int pageNr;
-		int firstTblTop;
-		int secondTblTop;
+		
+		int pageNr;         /// Current page number
+        int nrPages;        /// Total number of pages
+        float tableTop;     /// Top coordinate of the table
+
+        int[] firstTblRowsOnPage;
+        int[] secondTblRowsOnPage;
+
+        
+        PageOrientation pageOrientation;
 
 		/// <summary>
 		/// Property variable for the Font the user wishes to use
@@ -51,7 +58,34 @@ namespace Results.Output.Printers.Munich
         Font boldFont;
         Font fontTitle;
 
-		/// <summary>
+        ///
+        /// 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>
 		/// Constructor
 		/// </summary>
 		/// <param name="textToPrint">Text to be printed</param>
@@ -61,7 +95,8 @@ namespace Results.Output.Printers.Munich
 		{
             this.docVersion = docVersion;
 			this.wm = wm;
-			compound = wm.Compound();
+			this.compound = wm.Compound();
+            this.pageOrientation = pageOrientation;
 
             string[] info = wm.ProductName().Split(new char[] { ';' });
             if (info.Length >= 2)
@@ -81,13 +116,88 @@ namespace Results.Output.Printers.Munich
             }
 
 			results = wm.MeterTestRslts;
-            this.resultsCount = compound ? (results.Count / 3) : results.Count;
 
-			int resultsCount = wm.MeterTestRslts.Count;
-			if (compound) resultsCount /= 3;
+			resultsCount = 0;
+            foreach (var mtr in wm.MeterTestRslts)
+            {
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) resultsCount++;
+            }
 
 			pageNr = 1;
-			nrPages = (compound ? (resultsCount > 7) : (resultsCount > 9)) ? 2 : 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 };
+                }
+            }
 
 			DefaultPageSettings.Landscape = (pageOrientation == PageOrientation.Landscape);
 		}
@@ -116,8 +226,30 @@ namespace Results.Output.Printers.Munich
 			/// Run base code
 			base.OnPrintPage(e);
 
-			/// Draw 2550 x 3507 'headpic' scaled to A4 at 100 DPI
-			e.Graphics.DrawImage(Results.Properties.Resources.Headpic, new Rectangle(0, 0, 827, 1137));
+            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;
+                    }
+                }
+            }
 
 			/// 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;
@@ -144,27 +276,21 @@ namespace Results.Output.Printers.Munich
 
 			if (pageNr == 1)
 			{
-				RectangleF printArea = new RectangleF(TitleX, TitleY, 667, 50);
+                /// This is the first page, drad the title, common part and the 1st table
+                
+                RectangleF printArea = new RectangleF(TitleX, TitleY, 667, 50);
 				e.Graphics.DrawString(wm.Batch.ProtocolTitle, this.fontTitle, Brushes.Black, printArea);
 
-				///
-				/// 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);
+                DrawCommonTop(e, ref lineNr, wm, pruefvorlage, docVersion);
+
 				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)
 				{
@@ -189,228 +315,294 @@ namespace Results.Output.Printers.Munich
 					PrintAt(e, Tab3, lineNr * SpacingOne, "Seriennummer :");
 					PrintAt(e, Tab4, lineNr * SpacingOne, wm.SerialNrAux);
 				}
-				lineNr++;
+				lineNr += ((resultsCount + 2) * SpacingOneAndHalf) / SpacingOne + 2;
 
-				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);
+                tableTop = TitleY + (compound ? 5 : 4) * SpacingOne;
 			}
 
+            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 (compound)
-					{
-						PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler");
-						PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler");
-						lineNr++;
-					}
+            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;
+            }
 
-					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++;
+            if (pageNr == nrPages)
+            {
+                int top = topMargin + printHeight - 8 * SpacingOne;
+                DrawCommonBottom(e, top, wm);
+            }
+            else
+            {
+                e.HasMorePages = true;
+            }
 
-					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++;
-		}
+            ///
+            ///  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);
+        }
 
 		/// <summary>
-		/// Print table texts.
+		/// Prepares content and style of the first table.
 		/// </summary>
-		void PrintTableOne(System.Drawing.Printing.PrintPageEventArgs e, int tblTop)
+        /// <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)
 		{
-			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");
+            Table table = new Table(7);
+            table.Style = tableStyle; 
 
-			int rowCnt = 1;
+            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;
 			foreach (var mtr in wm.MeterTestRslts) 
 			{
-				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 (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;
 
-						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");
-					}
+                        if (compound)
+                        {
+                            Results.Entities.MeterTestRslt mainMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
+                            Results.Entities.MeterTestRslt auxMtr = wm.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
 
-                    rowCnt++;
+                            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++;
 				}
 			}
+
+            return table;
 		}
 
-		void PrintTableTwo(System.Drawing.Printing.PrintPageEventArgs e, int tblTop)
+        /// <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)
 		{
-			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.");
+            Table table = new Table(7);
+            table.Style = tableStyle;
 
-			int rowCnt = 1;
+            string[] tableHeader = new string[]
+            {
+                "", 
+                "Q [l/h]", 
+                "Temperatur",
+                "Dichte",
+                "Prüfzeit",
+                "Druck Eing.",
+                "Druck Ausg.",
+            };
+            table.AddRow(tableHeader, horizontalAlignment, verticalAlignment);
+
+            int rowCount = 0;
 			foreach (var mtr in wm.MeterTestRslts)
 			{
-				if (!compound || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
-				{
-					Point p = GetTabItemPos(rowCnt, 0, tblTop);
-					PrintAt(e, p.X, p.Y, mtr.Name());
+                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;
 
-					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++;
-				}
+                        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++;
+                }
 			}
+
+            return table;
 		}
 
-		/// <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;
+        /// <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;
 
-			// 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));
+            if (compound)
+            {
+                PrintBoldAt(e, Tab1, lineNr * SpacingOne, "Hauptzahler");
+                PrintBoldAt(e, Tab3, lineNr * SpacingOne, "Nebenzahler");
+                lineNr++;
+            }
 
-			// 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));
-		}
+            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");
+        }
 
 
 		void PrintAt(System.Drawing.Printing.PrintPageEventArgs e, Point p, string text)
@@ -434,18 +626,5 @@ 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,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
@@ -25,6 +28,7 @@ namespace Results.Output.Printers
         public float LineWidth;
         public TableLines HorizLines;
         public TableLines VertLines;
+        public float[] ColumnWidths;        /// null = automatic
     }
 
     public class Table
@@ -154,6 +158,10 @@ 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.995.0")]
-[assembly: AssemblyFileVersion("2.18.995.0")]
+[assembly: AssemblyVersion("2.18.1110.0")]
+[assembly: AssemblyFileVersion("2.18.1110.0")]

Results/Resources/Strings.Designer.cs

@@ -114,6 +114,15 @@ 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>
@@ -1059,6 +1068,15 @@ 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>

Results/Resources/Strings.cs.resx

@@ -252,4 +252,7 @@
   <data name="Address" xml:space="preserve">
     <value>Adresa</value>
   </data>
+  <data name="Batch" xml:space="preserve">
+    <value>Dávka</value>
+  </data>
 </root>

Results/Resources/Strings.resx

@@ -735,4 +735,10 @@
   <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>
 </root>

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TORINO_50;LANG_IT</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;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;TORINO_50;LANG_IT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -104,6 +104,10 @@
       <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>

Results/WMeterRsltItemSpec.cs

@@ -154,8 +154,9 @@ namespace Results
             /// 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.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.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) == 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)));
@@ -309,12 +310,14 @@ namespace Results
             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 TURA_IPERL || TURA_SPECIAL
+#if ORACLE_DB
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.LastError, string.Format("{0} rel. last ()", Strings.VName_Error), Strings.Tooltip_E_rel_last, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).LastError)));
 #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)));
 #endif
-            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.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.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
 
@@ -398,8 +401,9 @@ 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.Remark,      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.WM_remark,   string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark),  Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.Remark)));
+			AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark,      string.Format("{0} {1}", Strings.Batch, Strings.Remark),        Quantity.String, ItemCategory.TestResult,  (w, t, u, f, p) => FormatStr(f, w.Batch.Remark)));
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type,  Strings.Meter_type,  Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single))));
 
 #if HEAT_METERS
@@ -408,20 +412,25 @@ namespace Results
 #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.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)));
+            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 R-L",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.Q2CorrRL)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow,       "iPerl Q2Corr L-R",        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
 #endif
-            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.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.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));
@@ -454,9 +463,22 @@ namespace Results
             return  string.IsNullOrEmpty(format) ? value : string.Format(format, value);
         }
 
+        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 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

@@ -0,0 +1,66 @@
+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

@@ -0,0 +1,72 @@
+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

@@ -0,0 +1,39 @@
+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/Factory.cs

@@ -18,19 +18,23 @@ 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;
@@ -39,11 +43,13 @@ namespace ResultsBrowser.Filters
 
         public static IFilter GetFilter(string filterID)
         {
-			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();
+            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();
             else return null;
         }
 
@@ -53,11 +59,13 @@ namespace ResultsBrowser.Filters
 			try
 			{
                 Type type;
-                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);
+                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);
                 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(138, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(360, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // ProcedureFilter
+            // ProcedureFilterUI
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "ProcedureFilter";
+            this.Name = "ProcedureFilterUI";
             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(138, 20);
+            this.procedureTextBox.Size = new System.Drawing.Size(80, 20);
             this.procedureTextBox.TabIndex = 0;
             // 
-            // QnFilter
+            // QnFilterUI
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.groupBox1);
-            this.Name = "QnFilter";
+            this.Name = "QnFilterUI";
             this.Size = new System.Drawing.Size(835, 40);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

ResultsBrowser/Filters/SerialNrFilter.cs

@@ -30,7 +30,6 @@ namespace ResultsBrowser.Filters
         ///
         public string SerialNr;
 
-
         private SerialNrFilterUI userIface;
 
         public SerialNrFilter()
@@ -42,21 +41,50 @@ 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)
                 {
-                    IList<WaterMeter> wms = se.QueryOver<WaterMeter>()
-                                              .Where(x => (x.SerialNr == SerialNr))
-                                              .List<WaterMeter>();
-                    foreach (var wm in wms) filteredWaterMeters.Add(wm);
+                    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);
+                    }
                 }
             }
             else
             {
                 foreach (var wm in waterMeters)
                 {
-                    if (wm.SerialNr == SerialNr) filteredWaterMeters.Add(wm);
+                    if (serialNumbers.Contains(wm.SerialNr)) filteredWaterMeters.Add(wm);
                 }
             }
 

ResultsBrowser/Filters/SerialNrFilterUI.Designer.cs

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

ResultsBrowser/Filters/SerialNrFilterUI.cs

@@ -35,5 +35,14 @@ namespace ResultsBrowser.Filters
 		{
             data.SerialNr = serialNrTextBox.Text;
 		}
+
+        private void serialNrTextBox_MouseDoubleClick(object sender, MouseEventArgs e)
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            if (dlg.ShowDialog() == DialogResult.OK)
+            {
+                serialNrTextBox.Text = string.Format("@{0}", dlg.FileName);
+            }
+        }
     }
 }

ResultsBrowser/Filters/WMPositionFilter.cs

@@ -0,0 +1,68 @@
+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;
+using ResultsBrowser.Resources;
+
+namespace ResultsBrowser.Filters
+{
+    public class WMPositionFilter : IFilter
+    {
+        public static string GetFilterID() { return "WM_position"; }
+        public static string GetFilterName() { return "WM Position"; }
+
+        ///
+        /// 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 WMPosition;
+
+
+        private WMPositionFilterUI userIface;
+
+        public WMPositionFilter()
+        {
+            userIface = new WMPositionFilterUI(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<Batch> batches = se.QueryOver<Batch>()
+                                             .List<Batch>();
+
+                    foreach (var b in batches)
+                    {
+                        foreach (var wm in b.WaterMeters) if (wm.WMPosition == this.WMPosition) filteredWaterMeters.Add(wm);
+                    }
+                }
+            }
+            else
+            {
+                foreach (var wm in waterMeters)
+                {
+                    if (wm.WMPosition == this.WMPosition) filteredWaterMeters.Add(wm);
+                }
+            }
+
+            return filteredWaterMeters;
+        }
+    }
+}

ResultsBrowser/Filters/WMPositionFilterUI.Designer.cs

@@ -0,0 +1,72 @@
+namespace ResultsBrowser.Filters
+{
+    partial class WMPositionFilterUI
+    {
+        /// <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.wmPositionTextBox = new System.Windows.Forms.TextBox();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.wmPositionTextBox);
+            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 = "WM Position";
+            // 
+            // wmPositionTextBox
+            // 
+            this.wmPositionTextBox.Location = new System.Drawing.Point(132, 13);
+            this.wmPositionTextBox.Name = "wmPositionTextBox";
+            this.wmPositionTextBox.Size = new System.Drawing.Size(80, 20);
+            this.wmPositionTextBox.TabIndex = 0;
+            // 
+            // WMPositionFilterUI
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupBox1);
+            this.Name = "WMPositionFilterUI";
+            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 wmPositionTextBox;
+    }
+}

ResultsBrowser/Filters/WMPositionFilterUI.cs

@@ -0,0 +1,47 @@
+using System.Windows.Forms;
+
+namespace ResultsBrowser.Filters
+{
+    public partial class WMPositionFilterUI : UserControl
+    {
+        WMPositionFilter data;
+
+        /// <summary> Used only by Designer </summary>
+        public WMPositionFilterUI()
+        {
+            InitializeComponent();
+            Localize();
+        }
+
+        /// <summary> Used to create the control aby a filter </summary>
+        public WMPositionFilterUI(WMPositionFilter data)
+        {
+            this.data = data;
+            InitializeComponent();
+            Localize();
+        }
+
+        void Localize()
+        {
+            groupBox1.Text = WMPositionFilter.GetFilterName();
+        }
+
+		public void Data2UI()
+		{
+            wmPositionTextBox.Text = data.WMPosition.ToString();
+		}
+
+		public void UI2Data()
+		{
+            int pos;
+            if (int.TryParse(wmPositionTextBox.Text, out pos) && (pos >= 1) && (pos <= 40))
+            {
+                data.WMPosition = pos;
+            }
+            else
+            {
+                data.WMPosition = 0;
+            }
+		}
+	}
+}

ResultsBrowser/Forms/DatabaseSettingsDlg.Designer.cs

@@ -28,204 +28,222 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.connectionStringTextBox1 = new System.Windows.Forms.TextBox();
-			this.benchNameLabel = new System.Windows.Forms.Label();
-			this.connectionStringLabel = new System.Windows.Forms.Label();
-			this.connectionStringTextBox2 = new System.Windows.Forms.TextBox();
-			this.connectionStringTextBox3 = new System.Windows.Forms.TextBox();
-			this.okButton = new System.Windows.Forms.Button();
-			this.cancelButton = new System.Windows.Forms.Button();
-			this.benchNameTextBox1 = new System.Windows.Forms.TextBox();
-			this.benchNameTextBox2 = new System.Windows.Forms.TextBox();
-			this.benchNameTextBox3 = new System.Windows.Forms.TextBox();
-			this.languageLabel = new System.Windows.Forms.Label();
-			this.languageTextBox = new System.Windows.Forms.TextBox();
-			this.formatLabel = new System.Windows.Forms.Label();
-			this.timePeriodFormatTextBox = new System.Windows.Forms.TextBox();
-			this.benchNameTextBox5 = new System.Windows.Forms.TextBox();
-			this.benchNameTextBox4 = new System.Windows.Forms.TextBox();
-			this.connectionStringTextBox5 = new System.Windows.Forms.TextBox();
-			this.connectionStringTextBox4 = new System.Windows.Forms.TextBox();
-			this.SuspendLayout();
-			// 
-			// connectionStringTextBox1
-			// 
-			this.connectionStringTextBox1.Location = new System.Drawing.Point(157, 45);
-			this.connectionStringTextBox1.Name = "connectionStringTextBox1";
-			this.connectionStringTextBox1.Size = new System.Drawing.Size(555, 20);
-			this.connectionStringTextBox1.TabIndex = 3;
-			// 
-			// benchNameLabel
-			// 
-			this.benchNameLabel.AutoSize = true;
-			this.benchNameLabel.Location = new System.Drawing.Point(26, 20);
-			this.benchNameLabel.Name = "benchNameLabel";
-			this.benchNameLabel.Size = new System.Drawing.Size(67, 13);
-			this.benchNameLabel.TabIndex = 0;
-			this.benchNameLabel.Text = "Bench name";
-			// 
-			// connectionStringLabel
-			// 
-			this.connectionStringLabel.AutoSize = true;
-			this.connectionStringLabel.Location = new System.Drawing.Point(154, 20);
-			this.connectionStringLabel.Name = "connectionStringLabel";
-			this.connectionStringLabel.Size = new System.Drawing.Size(89, 13);
-			this.connectionStringLabel.TabIndex = 1;
-			this.connectionStringLabel.Text = "Connection string";
-			// 
-			// connectionStringTextBox2
-			// 
-			this.connectionStringTextBox2.Location = new System.Drawing.Point(157, 71);
-			this.connectionStringTextBox2.Name = "connectionStringTextBox2";
-			this.connectionStringTextBox2.Size = new System.Drawing.Size(555, 20);
-			this.connectionStringTextBox2.TabIndex = 5;
-			// 
-			// connectionStringTextBox3
-			// 
-			this.connectionStringTextBox3.Location = new System.Drawing.Point(157, 97);
-			this.connectionStringTextBox3.Name = "connectionStringTextBox3";
-			this.connectionStringTextBox3.Size = new System.Drawing.Size(555, 20);
-			this.connectionStringTextBox3.TabIndex = 7;
-			// 
-			// okButton
-			// 
-			this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.okButton.Location = new System.Drawing.Point(506, 250);
-			this.okButton.Name = "okButton";
-			this.okButton.Size = new System.Drawing.Size(95, 38);
-			this.okButton.TabIndex = 18;
-			this.okButton.Text = "OK";
-			this.okButton.UseVisualStyleBackColor = true;
-			this.okButton.Click += new System.EventHandler(this.okButton_Click);
-			// 
-			// cancelButton
-			// 
-			this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelButton.Location = new System.Drawing.Point(617, 250);
-			this.cancelButton.Name = "cancelButton";
-			this.cancelButton.Size = new System.Drawing.Size(95, 38);
-			this.cancelButton.TabIndex = 19;
-			this.cancelButton.Text = "Cancel";
-			this.cancelButton.UseVisualStyleBackColor = true;
-			this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-			// 
-			// benchNameTextBox1
-			// 
-			this.benchNameTextBox1.Location = new System.Drawing.Point(29, 45);
-			this.benchNameTextBox1.Name = "benchNameTextBox1";
-			this.benchNameTextBox1.Size = new System.Drawing.Size(100, 20);
-			this.benchNameTextBox1.TabIndex = 2;
-			// 
-			// benchNameTextBox2
-			// 
-			this.benchNameTextBox2.Location = new System.Drawing.Point(29, 71);
-			this.benchNameTextBox2.Name = "benchNameTextBox2";
-			this.benchNameTextBox2.Size = new System.Drawing.Size(100, 20);
-			this.benchNameTextBox2.TabIndex = 4;
-			// 
-			// benchNameTextBox3
-			// 
-			this.benchNameTextBox3.Location = new System.Drawing.Point(29, 97);
-			this.benchNameTextBox3.Name = "benchNameTextBox3";
-			this.benchNameTextBox3.Size = new System.Drawing.Size(100, 20);
-			this.benchNameTextBox3.TabIndex = 6;
-			// 
-			// languageLabel
-			// 
-			this.languageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.languageLabel.AutoSize = true;
-			this.languageLabel.Location = new System.Drawing.Point(26, 239);
-			this.languageLabel.Name = "languageLabel";
-			this.languageLabel.Size = new System.Drawing.Size(55, 13);
-			this.languageLabel.TabIndex = 14;
-			this.languageLabel.Text = "Language";
-			// 
-			// languageTextBox
-			// 
-			this.languageTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.languageTextBox.Location = new System.Drawing.Point(29, 263);
-			this.languageTextBox.Name = "languageTextBox";
-			this.languageTextBox.Size = new System.Drawing.Size(100, 20);
-			this.languageTextBox.TabIndex = 15;
-			// 
-			// formatLabel
-			// 
-			this.formatLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.formatLabel.AutoSize = true;
-			this.formatLabel.Location = new System.Drawing.Point(26, 185);
-			this.formatLabel.Name = "formatLabel";
-			this.formatLabel.Size = new System.Drawing.Size(94, 13);
-			this.formatLabel.TabIndex = 12;
-			this.formatLabel.Text = "Time period format";
-			// 
-			// timePeriodFormatTextBox
-			// 
-			this.timePeriodFormatTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.timePeriodFormatTextBox.Location = new System.Drawing.Point(29, 207);
-			this.timePeriodFormatTextBox.Name = "timePeriodFormatTextBox";
-			this.timePeriodFormatTextBox.Size = new System.Drawing.Size(683, 20);
-			this.timePeriodFormatTextBox.TabIndex = 13;
-			// 
-			// benchNameTextBox5
-			// 
-			this.benchNameTextBox5.Location = new System.Drawing.Point(29, 149);
-			this.benchNameTextBox5.Name = "benchNameTextBox5";
-			this.benchNameTextBox5.Size = new System.Drawing.Size(100, 20);
-			this.benchNameTextBox5.TabIndex = 10;
-			// 
-			// benchNameTextBox4
-			// 
-			this.benchNameTextBox4.Location = new System.Drawing.Point(29, 123);
-			this.benchNameTextBox4.Name = "benchNameTextBox4";
-			this.benchNameTextBox4.Size = new System.Drawing.Size(100, 20);
-			this.benchNameTextBox4.TabIndex = 8;
-			// 
-			// connectionStringTextBox5
-			// 
-			this.connectionStringTextBox5.Location = new System.Drawing.Point(157, 149);
-			this.connectionStringTextBox5.Name = "connectionStringTextBox5";
-			this.connectionStringTextBox5.Size = new System.Drawing.Size(555, 20);
-			this.connectionStringTextBox5.TabIndex = 11;
-			// 
-			// connectionStringTextBox4
-			// 
-			this.connectionStringTextBox4.Location = new System.Drawing.Point(157, 123);
-			this.connectionStringTextBox4.Name = "connectionStringTextBox4";
-			this.connectionStringTextBox4.Size = new System.Drawing.Size(555, 20);
-			this.connectionStringTextBox4.TabIndex = 9;
-			// 
-			// DatabaseSettingsDlg
-			// 
-			this.AcceptButton = this.okButton;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.cancelButton;
-			this.ClientSize = new System.Drawing.Size(743, 310);
-			this.Controls.Add(this.benchNameTextBox5);
-			this.Controls.Add(this.benchNameTextBox4);
-			this.Controls.Add(this.connectionStringTextBox5);
-			this.Controls.Add(this.connectionStringTextBox4);
-			this.Controls.Add(this.timePeriodFormatTextBox);
-			this.Controls.Add(this.formatLabel);
-			this.Controls.Add(this.languageTextBox);
-			this.Controls.Add(this.languageLabel);
-			this.Controls.Add(this.benchNameTextBox3);
-			this.Controls.Add(this.benchNameTextBox2);
-			this.Controls.Add(this.benchNameTextBox1);
-			this.Controls.Add(this.cancelButton);
-			this.Controls.Add(this.okButton);
-			this.Controls.Add(this.connectionStringTextBox3);
-			this.Controls.Add(this.connectionStringLabel);
-			this.Controls.Add(this.connectionStringTextBox2);
-			this.Controls.Add(this.benchNameLabel);
-			this.Controls.Add(this.connectionStringTextBox1);
-			this.Name = "DatabaseSettingsDlg";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Settings";
-			this.Load += new System.EventHandler(this.DatabaseSettings_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.connectionStringTextBox1 = new System.Windows.Forms.TextBox();
+            this.benchNameLabel = new System.Windows.Forms.Label();
+            this.connectionStringLabel = new System.Windows.Forms.Label();
+            this.connectionStringTextBox2 = new System.Windows.Forms.TextBox();
+            this.connectionStringTextBox3 = new System.Windows.Forms.TextBox();
+            this.okButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.benchNameTextBox1 = new System.Windows.Forms.TextBox();
+            this.benchNameTextBox2 = new System.Windows.Forms.TextBox();
+            this.benchNameTextBox3 = new System.Windows.Forms.TextBox();
+            this.languageLabel = new System.Windows.Forms.Label();
+            this.languageTextBox = new System.Windows.Forms.TextBox();
+            this.formatLabel = new System.Windows.Forms.Label();
+            this.timePeriodFormatTextBox = new System.Windows.Forms.TextBox();
+            this.benchNameTextBox5 = new System.Windows.Forms.TextBox();
+            this.benchNameTextBox4 = new System.Windows.Forms.TextBox();
+            this.connectionStringTextBox5 = new System.Windows.Forms.TextBox();
+            this.connectionStringTextBox4 = new System.Windows.Forms.TextBox();
+            this.benchNameTextBox6 = new System.Windows.Forms.TextBox();
+            this.connectionStringTextBox6 = new System.Windows.Forms.TextBox();
+            this.SuspendLayout();
+            // 
+            // connectionStringTextBox1
+            // 
+            this.connectionStringTextBox1.Location = new System.Drawing.Point(157, 45);
+            this.connectionStringTextBox1.Name = "connectionStringTextBox1";
+            this.connectionStringTextBox1.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox1.TabIndex = 3;
+            // 
+            // benchNameLabel
+            // 
+            this.benchNameLabel.AutoSize = true;
+            this.benchNameLabel.Location = new System.Drawing.Point(26, 23);
+            this.benchNameLabel.Name = "benchNameLabel";
+            this.benchNameLabel.Size = new System.Drawing.Size(67, 13);
+            this.benchNameLabel.TabIndex = 0;
+            this.benchNameLabel.Text = "Bench name";
+            // 
+            // connectionStringLabel
+            // 
+            this.connectionStringLabel.AutoSize = true;
+            this.connectionStringLabel.Location = new System.Drawing.Point(154, 23);
+            this.connectionStringLabel.Name = "connectionStringLabel";
+            this.connectionStringLabel.Size = new System.Drawing.Size(89, 13);
+            this.connectionStringLabel.TabIndex = 1;
+            this.connectionStringLabel.Text = "Connection string";
+            // 
+            // connectionStringTextBox2
+            // 
+            this.connectionStringTextBox2.Location = new System.Drawing.Point(157, 69);
+            this.connectionStringTextBox2.Name = "connectionStringTextBox2";
+            this.connectionStringTextBox2.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox2.TabIndex = 5;
+            // 
+            // connectionStringTextBox3
+            // 
+            this.connectionStringTextBox3.Location = new System.Drawing.Point(157, 93);
+            this.connectionStringTextBox3.Name = "connectionStringTextBox3";
+            this.connectionStringTextBox3.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox3.TabIndex = 7;
+            // 
+            // okButton
+            // 
+            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.okButton.Location = new System.Drawing.Point(506, 250);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(95, 38);
+            this.okButton.TabIndex = 18;
+            this.okButton.Text = "OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelButton.Location = new System.Drawing.Point(617, 250);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(95, 38);
+            this.cancelButton.TabIndex = 19;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+            // 
+            // benchNameTextBox1
+            // 
+            this.benchNameTextBox1.Location = new System.Drawing.Point(29, 45);
+            this.benchNameTextBox1.Name = "benchNameTextBox1";
+            this.benchNameTextBox1.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox1.TabIndex = 2;
+            // 
+            // benchNameTextBox2
+            // 
+            this.benchNameTextBox2.Location = new System.Drawing.Point(29, 69);
+            this.benchNameTextBox2.Name = "benchNameTextBox2";
+            this.benchNameTextBox2.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox2.TabIndex = 4;
+            // 
+            // benchNameTextBox3
+            // 
+            this.benchNameTextBox3.Location = new System.Drawing.Point(29, 93);
+            this.benchNameTextBox3.Name = "benchNameTextBox3";
+            this.benchNameTextBox3.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox3.TabIndex = 6;
+            // 
+            // languageLabel
+            // 
+            this.languageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.languageLabel.AutoSize = true;
+            this.languageLabel.Location = new System.Drawing.Point(26, 245);
+            this.languageLabel.Name = "languageLabel";
+            this.languageLabel.Size = new System.Drawing.Size(55, 13);
+            this.languageLabel.TabIndex = 14;
+            this.languageLabel.Text = "Language";
+            // 
+            // languageTextBox
+            // 
+            this.languageTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.languageTextBox.Location = new System.Drawing.Point(29, 263);
+            this.languageTextBox.Name = "languageTextBox";
+            this.languageTextBox.Size = new System.Drawing.Size(100, 20);
+            this.languageTextBox.TabIndex = 15;
+            // 
+            // formatLabel
+            // 
+            this.formatLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.formatLabel.AutoSize = true;
+            this.formatLabel.Location = new System.Drawing.Point(26, 196);
+            this.formatLabel.Name = "formatLabel";
+            this.formatLabel.Size = new System.Drawing.Size(94, 13);
+            this.formatLabel.TabIndex = 12;
+            this.formatLabel.Text = "Time period format";
+            // 
+            // timePeriodFormatTextBox
+            // 
+            this.timePeriodFormatTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.timePeriodFormatTextBox.Location = new System.Drawing.Point(29, 215);
+            this.timePeriodFormatTextBox.Name = "timePeriodFormatTextBox";
+            this.timePeriodFormatTextBox.Size = new System.Drawing.Size(683, 20);
+            this.timePeriodFormatTextBox.TabIndex = 13;
+            // 
+            // benchNameTextBox5
+            // 
+            this.benchNameTextBox5.Location = new System.Drawing.Point(29, 141);
+            this.benchNameTextBox5.Name = "benchNameTextBox5";
+            this.benchNameTextBox5.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox5.TabIndex = 10;
+            // 
+            // benchNameTextBox4
+            // 
+            this.benchNameTextBox4.Location = new System.Drawing.Point(29, 117);
+            this.benchNameTextBox4.Name = "benchNameTextBox4";
+            this.benchNameTextBox4.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox4.TabIndex = 8;
+            // 
+            // connectionStringTextBox5
+            // 
+            this.connectionStringTextBox5.Location = new System.Drawing.Point(157, 141);
+            this.connectionStringTextBox5.Name = "connectionStringTextBox5";
+            this.connectionStringTextBox5.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox5.TabIndex = 11;
+            // 
+            // connectionStringTextBox4
+            // 
+            this.connectionStringTextBox4.Location = new System.Drawing.Point(157, 117);
+            this.connectionStringTextBox4.Name = "connectionStringTextBox4";
+            this.connectionStringTextBox4.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox4.TabIndex = 9;
+            // 
+            // benchNameTextBox6
+            // 
+            this.benchNameTextBox6.Location = new System.Drawing.Point(29, 165);
+            this.benchNameTextBox6.Name = "benchNameTextBox6";
+            this.benchNameTextBox6.Size = new System.Drawing.Size(100, 20);
+            this.benchNameTextBox6.TabIndex = 20;
+            // 
+            // connectionStringTextBox6
+            // 
+            this.connectionStringTextBox6.Location = new System.Drawing.Point(157, 165);
+            this.connectionStringTextBox6.Name = "connectionStringTextBox6";
+            this.connectionStringTextBox6.Size = new System.Drawing.Size(555, 20);
+            this.connectionStringTextBox6.TabIndex = 21;
+            // 
+            // DatabaseSettingsDlg
+            // 
+            this.AcceptButton = this.okButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.cancelButton;
+            this.ClientSize = new System.Drawing.Size(743, 310);
+            this.Controls.Add(this.benchNameTextBox6);
+            this.Controls.Add(this.connectionStringTextBox6);
+            this.Controls.Add(this.benchNameTextBox5);
+            this.Controls.Add(this.benchNameTextBox4);
+            this.Controls.Add(this.connectionStringTextBox5);
+            this.Controls.Add(this.connectionStringTextBox4);
+            this.Controls.Add(this.timePeriodFormatTextBox);
+            this.Controls.Add(this.formatLabel);
+            this.Controls.Add(this.languageTextBox);
+            this.Controls.Add(this.languageLabel);
+            this.Controls.Add(this.benchNameTextBox3);
+            this.Controls.Add(this.benchNameTextBox2);
+            this.Controls.Add(this.benchNameTextBox1);
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.okButton);
+            this.Controls.Add(this.connectionStringTextBox3);
+            this.Controls.Add(this.connectionStringLabel);
+            this.Controls.Add(this.connectionStringTextBox2);
+            this.Controls.Add(this.benchNameLabel);
+            this.Controls.Add(this.connectionStringTextBox1);
+            this.Name = "DatabaseSettingsDlg";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Settings";
+            this.Load += new System.EventHandler(this.DatabaseSettings_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -249,5 +267,7 @@
         private System.Windows.Forms.TextBox benchNameTextBox4;
         private System.Windows.Forms.TextBox connectionStringTextBox5;
 		private System.Windows.Forms.TextBox connectionStringTextBox4;
+        private System.Windows.Forms.TextBox benchNameTextBox6;
+        private System.Windows.Forms.TextBox connectionStringTextBox6;
 	}
 }

ResultsBrowser/Forms/DatabaseSettingsDlg.cs

@@ -22,12 +22,14 @@ namespace ResultsBrowser.Forms
             benchNameTextBox3.Text = Program.LocalSettings.Bench3;
             benchNameTextBox4.Text = Program.LocalSettings.Bench4;
             benchNameTextBox5.Text = Program.LocalSettings.Bench5;
+            benchNameTextBox6.Text = Program.LocalSettings.Bench6;
 
             connectionStringTextBox1.Text = Program.LocalSettings.ConnectionString1;
 			connectionStringTextBox2.Text = Program.LocalSettings.ConnectionString2;
 			connectionStringTextBox3.Text = Program.LocalSettings.ConnectionString3;
             connectionStringTextBox4.Text = Program.LocalSettings.ConnectionString4;
             connectionStringTextBox5.Text = Program.LocalSettings.ConnectionString5;
+            connectionStringTextBox6.Text = Program.LocalSettings.ConnectionString6;
 
 			timePeriodFormatTextBox.Text = Program.LocalSettings.TimePeriodFormat;
 
@@ -52,12 +54,14 @@ namespace ResultsBrowser.Forms
             Program.LocalSettings.Bench3 = benchNameTextBox3.Text;
             Program.LocalSettings.Bench4 = benchNameTextBox4.Text;
             Program.LocalSettings.Bench5 = benchNameTextBox5.Text;
+            Program.LocalSettings.Bench6 = benchNameTextBox6.Text;
 
             Program.LocalSettings.ConnectionString1 = connectionStringTextBox1.Text;
 			Program.LocalSettings.ConnectionString2 = connectionStringTextBox2.Text;
 			Program.LocalSettings.ConnectionString3 = connectionStringTextBox3.Text;
             Program.LocalSettings.ConnectionString4 = connectionStringTextBox4.Text;
             Program.LocalSettings.ConnectionString5 = connectionStringTextBox5.Text;
+            Program.LocalSettings.ConnectionString6 = connectionStringTextBox6.Text;
 
 			Program.LocalSettings.TimePeriodFormat = timePeriodFormatTextBox.Text;
 

ResultsBrowser/Forms/PrinterConfigDlg.Designer.cs

@@ -28,76 +28,88 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.printerClassComboBox = new System.Windows.Forms.ComboBox();
-			this.changePrinterClassButton = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.configureButton = new System.Windows.Forms.Button();
-			this.cancelButton = new System.Windows.Forms.Button();
-			this.SuspendLayout();
-			// 
-			// printerClassComboBox
-			// 
-			this.printerClassComboBox.Enabled = false;
-			this.printerClassComboBox.FormattingEnabled = true;
-			this.printerClassComboBox.Location = new System.Drawing.Point(12, 29);
-			this.printerClassComboBox.Name = "printerClassComboBox";
-			this.printerClassComboBox.Size = new System.Drawing.Size(389, 21);
-			this.printerClassComboBox.TabIndex = 0;
-			// 
-			// changePrinterClassButton
-			// 
-			this.changePrinterClassButton.Location = new System.Drawing.Point(15, 67);
-			this.changePrinterClassButton.Name = "changePrinterClassButton";
-			this.changePrinterClassButton.Size = new System.Drawing.Size(161, 43);
-			this.changePrinterClassButton.TabIndex = 1;
-			this.changePrinterClassButton.Text = "Change printer type (configuration will be deleted)";
-			this.changePrinterClassButton.UseVisualStyleBackColor = true;
-			this.changePrinterClassButton.Click += new System.EventHandler(this.changePrinterClassButton_Click);
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(12, 9);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(60, 13);
-			this.label1.TabIndex = 2;
-			this.label1.Text = "Printer type";
-			// 
-			// configureButton
-			// 
-			this.configureButton.Location = new System.Drawing.Point(196, 67);
-			this.configureButton.Name = "configureButton";
-			this.configureButton.Size = new System.Drawing.Size(95, 43);
-			this.configureButton.TabIndex = 3;
-			this.configureButton.Text = "Configure";
-			this.configureButton.UseVisualStyleBackColor = true;
-			this.configureButton.Click += new System.EventHandler(this.configureButton_Click);
-			// 
-			// cancelButton
-			// 
-			this.cancelButton.Location = new System.Drawing.Point(306, 67);
-			this.cancelButton.Name = "cancelButton";
-			this.cancelButton.Size = new System.Drawing.Size(95, 43);
-			this.cancelButton.TabIndex = 4;
-			this.cancelButton.Text = "Cancel";
-			this.cancelButton.UseVisualStyleBackColor = true;
-			this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
-			// 
-			// PrinterConfigDlg
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(416, 122);
-			this.Controls.Add(this.cancelButton);
-			this.Controls.Add(this.configureButton);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.changePrinterClassButton);
-			this.Controls.Add(this.printerClassComboBox);
-			this.Name = "PrinterConfigDlg";
-			this.Text = "Printer configuration";
-			this.Load += new System.EventHandler(this.PrinterClassDlg_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.printerClassComboBox = new System.Windows.Forms.ComboBox();
+            this.changePrinterClassButton = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.configureButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.importButton = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // printerClassComboBox
+            // 
+            this.printerClassComboBox.Enabled = false;
+            this.printerClassComboBox.FormattingEnabled = true;
+            this.printerClassComboBox.Location = new System.Drawing.Point(12, 29);
+            this.printerClassComboBox.Name = "printerClassComboBox";
+            this.printerClassComboBox.Size = new System.Drawing.Size(457, 21);
+            this.printerClassComboBox.TabIndex = 0;
+            // 
+            // changePrinterClassButton
+            // 
+            this.changePrinterClassButton.Location = new System.Drawing.Point(12, 67);
+            this.changePrinterClassButton.Name = "changePrinterClassButton";
+            this.changePrinterClassButton.Size = new System.Drawing.Size(161, 43);
+            this.changePrinterClassButton.TabIndex = 1;
+            this.changePrinterClassButton.Text = "Change printer type (configuration will be deleted)";
+            this.changePrinterClassButton.UseVisualStyleBackColor = true;
+            this.changePrinterClassButton.Click += new System.EventHandler(this.changePrinterClassButton_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 9);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(60, 13);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "Printer type";
+            // 
+            // configureButton
+            // 
+            this.configureButton.Location = new System.Drawing.Point(188, 67);
+            this.configureButton.Name = "configureButton";
+            this.configureButton.Size = new System.Drawing.Size(83, 43);
+            this.configureButton.TabIndex = 3;
+            this.configureButton.Text = "Configure";
+            this.configureButton.UseVisualStyleBackColor = true;
+            this.configureButton.Click += new System.EventHandler(this.configureButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Location = new System.Drawing.Point(383, 67);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(84, 43);
+            this.cancelButton.TabIndex = 4;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+            // 
+            // importButton
+            // 
+            this.importButton.Location = new System.Drawing.Point(285, 67);
+            this.importButton.Name = "importButton";
+            this.importButton.Size = new System.Drawing.Size(83, 43);
+            this.importButton.TabIndex = 5;
+            this.importButton.Text = "Import";
+            this.importButton.UseVisualStyleBackColor = true;
+            this.importButton.Click += new System.EventHandler(this.importButton_Click);
+            // 
+            // PrinterConfigDlg
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(481, 122);
+            this.Controls.Add(this.importButton);
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.configureButton);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.changePrinterClassButton);
+            this.Controls.Add(this.printerClassComboBox);
+            this.Name = "PrinterConfigDlg";
+            this.Text = "Printer configuration";
+            this.Load += new System.EventHandler(this.PrinterClassDlg_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -108,5 +120,6 @@
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.Button configureButton;
 		private System.Windows.Forms.Button cancelButton;
+        private System.Windows.Forms.Button importButton;
 	}
 }

ResultsBrowser/Forms/PrinterConfigDlg.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Windows.Forms;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.BenchControl.Generic;
 
@@ -90,7 +92,7 @@ namespace ResultsBrowser.Forms
 			cfgControl.Config.ItemNr = 0;
 
 			TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
-			cfgForm.TbfComponents = new List<Config.Entities.Component>();
+			cfgForm.TbfComponents = new List<Component>();
 
 			cfgForm.ComponentCfgCtrl = cfgControl;
 			cfgForm.UnlockAfterStart = true;
@@ -104,23 +106,65 @@ namespace ResultsBrowser.Forms
 		}
 
 
-		/// <summary>
-		/// Updates component factory
-		/// </summary>
-		/// <param name="className">Component class name</param>
-		/// <param name="factory">Reference to a factory</param>
-		/// <returns>true when factory changed</returns>
-		IComponentFactory GetFactory(string className)
-		{
-			if (!string.IsNullOrEmpty(className))
-			{
-				foreach (var fac in TbfComponents.Factories)
-				{
-					if (fac.ClassName == className) return fac;
-				}
-			}
+        private void importButton_Click(object sender, EventArgs e)
+        {
+            string oriClassName = PrinterClass;
 
-			return null;
-		}
-	}
+            OpenFileDialog dlg = new OpenFileDialog();
+            if (dlg.ShowDialog() != DialogResult.OK) return;
+
+            /// Import a procedure from a file
+            Component newComponent = Component.Import(new StreamReader(dlg.FileName, System.Text.Encoding.UTF8));
+
+            bool classIsOK = false;
+            foreach (var pc in printerFactories)
+            {
+                if (newComponent.ClassName == pc.ClassName) { classIsOK = true; break; }
+            }
+
+            if (classIsOK)
+            {
+                printerClassComboBox.Text = newComponent.ClassName;
+
+                IComponentCfg printerCfg = TbfComponents.CmpntCfgFromCmpntEntity(newComponent);
+                if (printerCfg != null)
+                {
+                    PrinterClass = newComponent.ClassName;
+                    PrinterCfg = printerCfg.CreateDbEntity().Parameters;
+                    DialogResult = DialogResult.OK;
+                    Close();
+                }
+                else
+                {
+                    MessageBox.Show("Importing printer configuration failed, file is corrupt.");
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("Invalid class of the imported component.");
+                return;
+            }
+        }
+
+
+        /// <summary>
+        /// Updates component factory
+        /// </summary>
+        /// <param name="className">Component class name</param>
+        /// <param name="factory">Reference to a factory</param>
+        /// <returns>true when factory changed</returns>
+        IComponentFactory GetFactory(string className)
+        {
+            if (!string.IsNullOrEmpty(className))
+            {
+                foreach (var fac in TbfComponents.Factories)
+                {
+                    if (fac.ClassName == className) return fac;
+                }
+            }
+
+            return null;
+        }
+    }
 }

ResultsBrowser/LocalSettings.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015 Sensus Metering Systems
+/// Copyright (c) 2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;
@@ -29,6 +29,7 @@ namespace ResultsBrowser
         public string Bench3;
         public string Bench4;
         public string Bench5;
+        public string Bench6;
 
         /// Database settings of servers.
 		public string ConnectionString1;
@@ -36,12 +37,14 @@ namespace ResultsBrowser
 		public string ConnectionString3;
         public string ConnectionString4;
         public string ConnectionString5;
+        public string ConnectionString6;
 
         public bool Bench1Selected;
         public bool Bench2Selected;
         public bool Bench3Selected;
         public bool Bench4Selected;
         public bool Bench5Selected;
+        public bool Bench6Selected;
 
 		public string TimePeriodFormat;
 
@@ -106,6 +109,21 @@ namespace ResultsBrowser
             
         public LocalSettings()
         {
+#if TURA_IPERL || TURA_SPECIAL
+            Bench1 = "WR10";
+            Bench2 = "WR11";
+            Bench3 = "WR13";
+            Bench4 = "WR14";
+            Bench5 = "WR15";
+            Bench6 = "PT7";
+            ConnectionString1 = "SERVER=10.42.128.93; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString2 = "SERVER=10.42.128.102; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString3 = "SERVER=10.42.128.89; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString4 = "SERVER=10.42.128.213; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString5 = "SERVER=10.42.128.214; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            ConnectionString6 = "SERVER=10.42.129.26; DATABASE=iperlspecial-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;";
+            Language = "SK";
+#endif
         }
 
         /// <summary>

ResultsBrowser/Program.cs

@@ -14,25 +14,26 @@ namespace ResultsBrowser
 {
 	public class Program
 	{
+        static ILog log;                        /// log4net
+
         /// Program information
         public static string Version;			/// version string
         public static DateTime BuildDateTime;	/// date and time of program build
 
         /// Local settings
-        public static readonly string ExecutableDirectory;
-        public static readonly string ConfigDirectory;
-        public static readonly string LogDirectory;
-        public static readonly string LocalSettingsFileName;
-        public static readonly string LocalSettingsBackupName;
+        public static string ExecutableDirectory;
+        public static string ConfigDirectory;
+        public static string LogDirectory;
+        public static string LocalSettingsFileName;
+        public static string LocalSettingsBackupName;
         public static LocalSettings LocalSettings;
 
-
-		public static System.Globalization.CultureInfo AltCulture;
-
-        static readonly ILog log;               /// log4net
-
-        static Program()
-        {
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+        static void Main(string[] args)
+		{
             /// Program version string
             System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
             Version ver = thisAssembly.GetName().Version;
@@ -41,26 +42,26 @@ namespace ResultsBrowser
 
             /// Local program configuration directory including the trailing backslash
             ExecutableDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-            ConfigDirectory = Path.Combine(ExecutableDirectory, "..\\Cfg\\");
+#if false
+            /// Config directory is a sibling directory of the executable directory 
+            ConfigDirectory = Path.Combine(ExecutableDirectory, "..", string.Format("Cfg{0}", (args.Length >= 1) ? args[0] : string.Empty));
             LogDirectory = Path.Combine(ExecutableDirectory, "..\\Log\\");
-            LocalSettingsFileName = ConfigDirectory + "config.xml";
-            LocalSettingsBackupName = ConfigDirectory + "config.backup.xml";
+#else
+            /// Config directory is a directory in 'C:\Users\username\AppData\Local' folder
+            ConfigDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                                           string.Format("ResultsBrowser{0}", (args.Length >= 1) ? args[0] : string.Empty));
+            LogDirectory = "C:\\Temp\\ResultsBrowserLog\\";
+#endif
+            LocalSettingsFileName = Path.Combine(ConfigDirectory, "config.xml");
+            LocalSettingsBackupName = Path.Combine(ConfigDirectory, "config.backup.xml");
 
             /// Configue and start logging
             log4net.Config.XmlConfigurator.Configure(new System.IO.FileInfo(ConfigDirectory + "log4netConfig.xml"));
             log = LogManager.GetLogger(typeof(Program));
             log.Fatal("------------------------------------------------------------------------------------------------");
             log.Fatal("started");
-        }
-
-
-		/// <summary>
-		/// The main entry point for the application.
-		/// </summary>
-		[STAThread]
-        static void Main(string[] args)
-		{
-			///
+            
+            ///
 			/// Load the local settings
 			///
 			LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
@@ -93,7 +94,7 @@ namespace ResultsBrowser
 
 			try
 			{
-				string culture = LocalSettings.Language.Replace('_', '-');
+                string culture = (LocalSettings.Language != null) ? LocalSettings.Language.Replace('_', '-') : "EN";
 				System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(culture);
 			}
 			catch (Exception e)
@@ -107,9 +108,6 @@ namespace ResultsBrowser
 					new System.Globalization.CultureInfo("en");
 			}
 
-			//AltCulture = null;
-			AltCulture = new System.Globalization.CultureInfo("SK");
-
 
 			/// This belongs to Application.Run(new MainWnd()) ...
 			/// and should be executed before opening 'loginDlg'

ResultsBrowser/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.995.0")]
-[assembly: AssemblyFileVersion("2.18.995.0")]
+[assembly: AssemblyVersion("2.18.1115.0")]
+[assembly: AssemblyFileVersion("2.18.1115.0")]

ResultsBrowser/Resources/Strings.cs.resx

@@ -237,4 +237,7 @@
   <data name="Print" xml:space="preserve">
     <value>Vytisknout</value>
   </data>
+  <data name="Add_data_from_Oracle" xml:space="preserve">
+    <value>Dohledej údaje z Oracle</value>
+  </data>
 </root>

ResultsBrowser/Resources/Strings.resx

@@ -825,4 +825,7 @@
   <data name="Error_exporting_results" xml:space="preserve">
     <value>Error exporting results</value>
   </data>
+  <data name="Add_data_from_Oracle" xml:space="preserve">
+    <value>Add data from Oracle</value>
+  </data>
 </root>

ResultsBrowser/Resources/Strings1.Designer.cs

@@ -105,6 +105,15 @@ namespace ResultsBrowser.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Add data from Oracle.
+        /// </summary>
+        internal static string Add_data_from_Oracle {
+            get {
+                return ResourceManager.GetString("Add_data_from_Oracle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Add filter.
         /// </summary>

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TORINO_50;LANG_IT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;TORINO_50;LANG_IT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -70,6 +70,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Filters\BatchNrFilter.cs" />
+    <Compile Include="Filters\BatchNrFilterUI.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Filters\BatchNrFilterUI.designer.cs">
+      <DependentUpon>BatchNrFilterUI.cs</DependentUpon>
+    </Compile>
     <Compile Include="Filters\DateFilterUI.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -107,6 +114,13 @@
     <Compile Include="Filters\SerialNrFilterUI.Designer.cs">
       <DependentUpon>SerialNrFilterUI.cs</DependentUpon>
     </Compile>
+    <Compile Include="Filters\WMPositionFilter.cs" />
+    <Compile Include="Filters\WMPositionFilterUI.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Filters\WMPositionFilterUI.designer.cs">
+      <DependentUpon>WMPositionFilterUI.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\AddFilterDlg.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -161,6 +175,9 @@
     <Compile Include="ResultsBrowserWnd.Designer.cs">
       <DependentUpon>ResultsBrowserWnd.cs</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="Filters\BatchNrFilterUI.resx">
+      <DependentUpon>BatchNrFilterUI.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Filters\DateFilterUI.resx">
       <DependentUpon>DateFilterUI.cs</DependentUpon>
     </EmbeddedResource>
@@ -176,6 +193,9 @@
     <EmbeddedResource Include="Filters\SerialNrFilterUI.resx">
       <DependentUpon>SerialNrFilterUI.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Filters\WMPositionFilterUI.resx">
+      <DependentUpon>WMPositionFilterUI.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\AddFilterDlg.resx">
       <DependentUpon>AddFilterDlg.cs</DependentUpon>
     </EmbeddedResource>

ResultsBrowser/ResultsBrowserWnd.Designer.cs

@@ -28,337 +28,351 @@
         /// </summary>
         private void InitializeComponent()
         {
-			this.vSplitContainer = new System.Windows.Forms.SplitContainer();
-			this.hSplitContainer = new System.Windows.Forms.SplitContainer();
-			this.filtersGroupBox = new System.Windows.Forms.GroupBox();
-			this.filtersFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
-			this.resultsGroupBox = new System.Windows.Forms.GroupBox();
-			this.resultsListView = new System.Windows.Forms.ListView();
-			this.printerConfigBtn = new System.Windows.Forms.Button();
-			this.statisticsBtn = new System.Windows.Forms.Button();
-			this.printQueryResultsBtn = new System.Windows.Forms.Button();
-			this.exportQueryResultsBtn = new System.Windows.Forms.Button();
-			this.formatOfResultsBtn = new System.Windows.Forms.Button();
-			this.clearFiltersBtn = new System.Windows.Forms.Button();
-			this.settingsBtn = new System.Windows.Forms.Button();
-			this.saveConfigBtn = new System.Windows.Forms.Button();
-			this.loadConfigBtn = new System.Windows.Forms.Button();
-			this.executeQueryBtn = new System.Windows.Forms.Button();
-			this.addFilterBtn = new System.Windows.Forms.Button();
-			this.testBenchesGroupBox = new System.Windows.Forms.GroupBox();
-			this.checkBox5 = new System.Windows.Forms.RadioButton();
-			this.checkBox4 = new System.Windows.Forms.RadioButton();
-			this.checkBox3 = new System.Windows.Forms.RadioButton();
-			this.checkBox2 = new System.Windows.Forms.RadioButton();
-			this.checkBox1 = new System.Windows.Forms.RadioButton();
-			((System.ComponentModel.ISupportInitialize)(this.vSplitContainer)).BeginInit();
-			this.vSplitContainer.Panel1.SuspendLayout();
-			this.vSplitContainer.Panel2.SuspendLayout();
-			this.vSplitContainer.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.hSplitContainer)).BeginInit();
-			this.hSplitContainer.Panel1.SuspendLayout();
-			this.hSplitContainer.Panel2.SuspendLayout();
-			this.hSplitContainer.SuspendLayout();
-			this.filtersGroupBox.SuspendLayout();
-			this.resultsGroupBox.SuspendLayout();
-			this.testBenchesGroupBox.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// vSplitContainer
-			// 
-			this.vSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.vSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-			this.vSplitContainer.Location = new System.Drawing.Point(0, 0);
-			this.vSplitContainer.Name = "vSplitContainer";
-			// 
-			// vSplitContainer.Panel1
-			// 
-			this.vSplitContainer.Panel1.Controls.Add(this.hSplitContainer);
-			this.vSplitContainer.Panel1MinSize = 100;
-			// 
-			// vSplitContainer.Panel2
-			// 
-			this.vSplitContainer.Panel2.Controls.Add(this.printerConfigBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.statisticsBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.printQueryResultsBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.exportQueryResultsBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.formatOfResultsBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.clearFiltersBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.settingsBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.saveConfigBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.loadConfigBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.executeQueryBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.addFilterBtn);
-			this.vSplitContainer.Panel2.Controls.Add(this.testBenchesGroupBox);
-			this.vSplitContainer.Panel2MinSize = 100;
-			this.vSplitContainer.Size = new System.Drawing.Size(984, 712);
-			this.vSplitContainer.SplitterDistance = 840;
-			this.vSplitContainer.TabIndex = 0;
-			// 
-			// hSplitContainer
-			// 
-			this.hSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.hSplitContainer.Location = new System.Drawing.Point(0, 0);
-			this.hSplitContainer.Name = "hSplitContainer";
-			this.hSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
-			// 
-			// hSplitContainer.Panel1
-			// 
-			this.hSplitContainer.Panel1.Controls.Add(this.filtersGroupBox);
-			// 
-			// hSplitContainer.Panel2
-			// 
-			this.hSplitContainer.Panel2.Controls.Add(this.resultsGroupBox);
-			this.hSplitContainer.Size = new System.Drawing.Size(840, 712);
-			this.hSplitContainer.SplitterDistance = 280;
-			this.hSplitContainer.TabIndex = 0;
-			// 
-			// filtersGroupBox
-			// 
-			this.filtersGroupBox.Controls.Add(this.filtersFlowLayoutPanel);
-			this.filtersGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.filtersGroupBox.Location = new System.Drawing.Point(0, 0);
-			this.filtersGroupBox.Name = "filtersGroupBox";
-			this.filtersGroupBox.Size = new System.Drawing.Size(840, 280);
-			this.filtersGroupBox.TabIndex = 1;
-			this.filtersGroupBox.TabStop = false;
-			this.filtersGroupBox.Text = "Filters";
-			// 
-			// filtersFlowLayoutPanel
-			// 
-			this.filtersFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.filtersFlowLayoutPanel.Location = new System.Drawing.Point(3, 16);
-			this.filtersFlowLayoutPanel.Name = "filtersFlowLayoutPanel";
-			this.filtersFlowLayoutPanel.Size = new System.Drawing.Size(834, 261);
-			this.filtersFlowLayoutPanel.TabIndex = 0;
-			// 
-			// resultsGroupBox
-			// 
-			this.resultsGroupBox.Controls.Add(this.resultsListView);
-			this.resultsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.resultsGroupBox.Location = new System.Drawing.Point(0, 0);
-			this.resultsGroupBox.Name = "resultsGroupBox";
-			this.resultsGroupBox.Size = new System.Drawing.Size(840, 428);
-			this.resultsGroupBox.TabIndex = 1;
-			this.resultsGroupBox.TabStop = false;
-			this.resultsGroupBox.Text = "Query results";
-			// 
-			// resultsListView
-			// 
-			this.resultsListView.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.resultsListView.Location = new System.Drawing.Point(3, 16);
-			this.resultsListView.Name = "resultsListView";
-			this.resultsListView.Size = new System.Drawing.Size(834, 409);
-			this.resultsListView.TabIndex = 0;
-			this.resultsListView.UseCompatibleStateImageBehavior = false;
-			this.resultsListView.View = System.Windows.Forms.View.Details;
-			// 
-			// printerConfigBtn
-			// 
-			this.printerConfigBtn.Location = new System.Drawing.Point(8, 316);
-			this.printerConfigBtn.Name = "printerConfigBtn";
-			this.printerConfigBtn.Size = new System.Drawing.Size(125, 35);
-			this.printerConfigBtn.TabIndex = 11;
-			this.printerConfigBtn.Text = "Configure printer";
-			this.printerConfigBtn.UseVisualStyleBackColor = true;
-			this.printerConfigBtn.Click += new System.EventHandler(this.printerConfigBtn_Click);
-			// 
-			// statisticsBtn
-			// 
-			this.statisticsBtn.Location = new System.Drawing.Point(8, 621);
-			this.statisticsBtn.Name = "statisticsBtn";
-			this.statisticsBtn.Size = new System.Drawing.Size(125, 35);
-			this.statisticsBtn.TabIndex = 10;
-			this.statisticsBtn.Text = "Statistics";
-			this.statisticsBtn.UseVisualStyleBackColor = true;
-			this.statisticsBtn.Click += new System.EventHandler(this.statisticsBtn_Click);
-			// 
-			// printQueryResultsBtn
-			// 
-			this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 548);
-			this.printQueryResultsBtn.Name = "printQueryResultsBtn";
-			this.printQueryResultsBtn.Size = new System.Drawing.Size(125, 35);
-			this.printQueryResultsBtn.TabIndex = 9;
-			this.printQueryResultsBtn.Text = "Print query results";
-			this.printQueryResultsBtn.UseVisualStyleBackColor = true;
-			this.printQueryResultsBtn.Click += new System.EventHandler(this.printQueryResultsBtn_Click);
-			// 
-			// exportQueryResultsBtn
-			// 
-			this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 508);
-			this.exportQueryResultsBtn.Name = "exportQueryResultsBtn";
-			this.exportQueryResultsBtn.Size = new System.Drawing.Size(125, 35);
-			this.exportQueryResultsBtn.TabIndex = 8;
-			this.exportQueryResultsBtn.Text = "Export query results";
-			this.exportQueryResultsBtn.UseVisualStyleBackColor = true;
-			this.exportQueryResultsBtn.Click += new System.EventHandler(this.exportQueryResultsBtn_Click);
-			// 
-			// formatOfResultsBtn
-			// 
-			this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 276);
-			this.formatOfResultsBtn.Name = "formatOfResultsBtn";
-			this.formatOfResultsBtn.Size = new System.Drawing.Size(125, 35);
-			this.formatOfResultsBtn.TabIndex = 7;
-			this.formatOfResultsBtn.Text = "Configure output";
-			this.formatOfResultsBtn.UseVisualStyleBackColor = true;
-			this.formatOfResultsBtn.Click += new System.EventHandler(this.formatOfResultsBtn_Click);
-			// 
-			// clearFiltersBtn
-			// 
-			this.clearFiltersBtn.Location = new System.Drawing.Point(8, 196);
-			this.clearFiltersBtn.Name = "clearFiltersBtn";
-			this.clearFiltersBtn.Size = new System.Drawing.Size(125, 35);
-			this.clearFiltersBtn.TabIndex = 2;
-			this.clearFiltersBtn.Text = "Clear filters";
-			this.clearFiltersBtn.UseVisualStyleBackColor = true;
-			this.clearFiltersBtn.Click += new System.EventHandler(this.clearFiltersBtn_Click);
-			// 
-			// settingsBtn
-			// 
-			this.settingsBtn.Location = new System.Drawing.Point(8, 12);
-			this.settingsBtn.Name = "settingsBtn";
-			this.settingsBtn.Size = new System.Drawing.Size(125, 33);
-			this.settingsBtn.TabIndex = 0;
-			this.settingsBtn.Text = "Settings";
-			this.settingsBtn.UseVisualStyleBackColor = true;
-			this.settingsBtn.Click += new System.EventHandler(this.settingsBtn_Click);
-			// 
-			// saveConfigBtn
-			// 
-			this.saveConfigBtn.Location = new System.Drawing.Point(8, 356);
-			this.saveConfigBtn.Name = "saveConfigBtn";
-			this.saveConfigBtn.Size = new System.Drawing.Size(125, 35);
-			this.saveConfigBtn.TabIndex = 5;
-			this.saveConfigBtn.Text = "Save configuration";
-			this.saveConfigBtn.UseVisualStyleBackColor = true;
-			this.saveConfigBtn.Click += new System.EventHandler(this.saveConfigBtn_Click);
-			// 
-			// loadConfigBtn
-			// 
-			this.loadConfigBtn.Location = new System.Drawing.Point(8, 396);
-			this.loadConfigBtn.Name = "loadConfigBtn";
-			this.loadConfigBtn.Size = new System.Drawing.Size(125, 35);
-			this.loadConfigBtn.TabIndex = 4;
-			this.loadConfigBtn.Text = "Load configuration";
-			this.loadConfigBtn.UseVisualStyleBackColor = true;
-			this.loadConfigBtn.Click += new System.EventHandler(this.loadConfigBtn_Click);
-			// 
-			// executeQueryBtn
-			// 
-			this.executeQueryBtn.Location = new System.Drawing.Point(8, 468);
-			this.executeQueryBtn.Name = "executeQueryBtn";
-			this.executeQueryBtn.Size = new System.Drawing.Size(125, 35);
-			this.executeQueryBtn.TabIndex = 6;
-			this.executeQueryBtn.Text = "Execute query";
-			this.executeQueryBtn.UseVisualStyleBackColor = true;
-			this.executeQueryBtn.Click += new System.EventHandler(this.executeQueryBtn_Click);
-			// 
-			// addFilterBtn
-			// 
-			this.addFilterBtn.Location = new System.Drawing.Point(8, 236);
-			this.addFilterBtn.Name = "addFilterBtn";
-			this.addFilterBtn.Size = new System.Drawing.Size(125, 35);
-			this.addFilterBtn.TabIndex = 3;
-			this.addFilterBtn.Text = "Add filter";
-			this.addFilterBtn.UseVisualStyleBackColor = true;
-			this.addFilterBtn.Click += new System.EventHandler(this.addFilterBtn_Click);
-			// 
-			// testBenchesGroupBox
-			// 
-			this.testBenchesGroupBox.Controls.Add(this.checkBox5);
-			this.testBenchesGroupBox.Controls.Add(this.checkBox4);
-			this.testBenchesGroupBox.Controls.Add(this.checkBox3);
-			this.testBenchesGroupBox.Controls.Add(this.checkBox2);
-			this.testBenchesGroupBox.Controls.Add(this.checkBox1);
-			this.testBenchesGroupBox.Location = new System.Drawing.Point(8, 54);
-			this.testBenchesGroupBox.Name = "testBenchesGroupBox";
-			this.testBenchesGroupBox.Size = new System.Drawing.Size(125, 135);
-			this.testBenchesGroupBox.TabIndex = 1;
-			this.testBenchesGroupBox.TabStop = false;
-			this.testBenchesGroupBox.Text = "Test benches";
-			// 
-			// checkBox5
-			// 
-			this.checkBox5.AutoSize = true;
-			this.checkBox5.Location = new System.Drawing.Point(23, 106);
-			this.checkBox5.Name = "checkBox5";
-			this.checkBox5.Size = new System.Drawing.Size(85, 17);
-			this.checkBox5.TabIndex = 4;
-			this.checkBox5.TabStop = true;
-			this.checkBox5.Text = "radioButton5";
-			this.checkBox5.UseVisualStyleBackColor = true;
-			this.checkBox5.CheckedChanged += new System.EventHandler(this.checkBox5_CheckedChanged);
-			// 
-			// checkBox4
-			// 
-			this.checkBox4.AutoSize = true;
-			this.checkBox4.Location = new System.Drawing.Point(23, 86);
-			this.checkBox4.Name = "checkBox4";
-			this.checkBox4.Size = new System.Drawing.Size(85, 17);
-			this.checkBox4.TabIndex = 3;
-			this.checkBox4.TabStop = true;
-			this.checkBox4.Text = "radioButton4";
-			this.checkBox4.UseVisualStyleBackColor = true;
-			this.checkBox4.CheckedChanged += new System.EventHandler(this.checkBox4_CheckedChanged);
-			// 
-			// checkBox3
-			// 
-			this.checkBox3.AutoSize = true;
-			this.checkBox3.Location = new System.Drawing.Point(23, 65);
-			this.checkBox3.Name = "checkBox3";
-			this.checkBox3.Size = new System.Drawing.Size(85, 17);
-			this.checkBox3.TabIndex = 2;
-			this.checkBox3.TabStop = true;
-			this.checkBox3.Text = "radioButton3";
-			this.checkBox3.UseVisualStyleBackColor = true;
-			this.checkBox3.CheckedChanged += new System.EventHandler(this.checkBox3_CheckedChanged);
-			// 
-			// checkBox2
-			// 
-			this.checkBox2.AutoSize = true;
-			this.checkBox2.Location = new System.Drawing.Point(23, 44);
-			this.checkBox2.Name = "checkBox2";
-			this.checkBox2.Size = new System.Drawing.Size(85, 17);
-			this.checkBox2.TabIndex = 1;
-			this.checkBox2.TabStop = true;
-			this.checkBox2.Text = "radioButton2";
-			this.checkBox2.UseVisualStyleBackColor = true;
-			this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
-			// 
-			// checkBox1
-			// 
-			this.checkBox1.AutoSize = true;
-			this.checkBox1.Location = new System.Drawing.Point(23, 23);
-			this.checkBox1.Name = "checkBox1";
-			this.checkBox1.Size = new System.Drawing.Size(85, 17);
-			this.checkBox1.TabIndex = 0;
-			this.checkBox1.TabStop = true;
-			this.checkBox1.Text = "radioButton1";
-			this.checkBox1.UseVisualStyleBackColor = true;
-			this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
-			// 
-			// ResultsBrowserWnd
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(984, 712);
-			this.Controls.Add(this.vSplitContainer);
-			this.Name = "ResultsBrowserWnd";
-			this.Text = "Results Browser";
-			this.Load += new System.EventHandler(this.ResultsBrowserWnd_Load);
-			this.vSplitContainer.Panel1.ResumeLayout(false);
-			this.vSplitContainer.Panel2.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.vSplitContainer)).EndInit();
-			this.vSplitContainer.ResumeLayout(false);
-			this.hSplitContainer.Panel1.ResumeLayout(false);
-			this.hSplitContainer.Panel2.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.hSplitContainer)).EndInit();
-			this.hSplitContainer.ResumeLayout(false);
-			this.filtersGroupBox.ResumeLayout(false);
-			this.resultsGroupBox.ResumeLayout(false);
-			this.testBenchesGroupBox.ResumeLayout(false);
-			this.testBenchesGroupBox.PerformLayout();
-			this.ResumeLayout(false);
+            this.vSplitContainer = new System.Windows.Forms.SplitContainer();
+            this.hSplitContainer = new System.Windows.Forms.SplitContainer();
+            this.filtersGroupBox = new System.Windows.Forms.GroupBox();
+            this.filtersFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
+            this.resultsGroupBox = new System.Windows.Forms.GroupBox();
+            this.resultsListView = new System.Windows.Forms.ListView();
+            this.printerConfigBtn = new System.Windows.Forms.Button();
+            this.statisticsBtn = new System.Windows.Forms.Button();
+            this.printQueryResultsBtn = new System.Windows.Forms.Button();
+            this.exportQueryResultsBtn = new System.Windows.Forms.Button();
+            this.formatOfResultsBtn = new System.Windows.Forms.Button();
+            this.clearFiltersBtn = new System.Windows.Forms.Button();
+            this.settingsBtn = new System.Windows.Forms.Button();
+            this.saveConfigBtn = new System.Windows.Forms.Button();
+            this.loadConfigBtn = new System.Windows.Forms.Button();
+            this.executeQueryBtn = new System.Windows.Forms.Button();
+            this.addFilterBtn = new System.Windows.Forms.Button();
+            this.testBenchesGroupBox = new System.Windows.Forms.GroupBox();
+            this.checkBox6 = new System.Windows.Forms.RadioButton();
+            this.checkBox5 = new System.Windows.Forms.RadioButton();
+            this.checkBox4 = new System.Windows.Forms.RadioButton();
+            this.checkBox3 = new System.Windows.Forms.RadioButton();
+            this.checkBox2 = new System.Windows.Forms.RadioButton();
+            this.checkBox1 = new System.Windows.Forms.RadioButton();
+            ((System.ComponentModel.ISupportInitialize)(this.vSplitContainer)).BeginInit();
+            this.vSplitContainer.Panel1.SuspendLayout();
+            this.vSplitContainer.Panel2.SuspendLayout();
+            this.vSplitContainer.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.hSplitContainer)).BeginInit();
+            this.hSplitContainer.Panel1.SuspendLayout();
+            this.hSplitContainer.Panel2.SuspendLayout();
+            this.hSplitContainer.SuspendLayout();
+            this.filtersGroupBox.SuspendLayout();
+            this.resultsGroupBox.SuspendLayout();
+            this.testBenchesGroupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // vSplitContainer
+            // 
+            this.vSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.vSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.vSplitContainer.Location = new System.Drawing.Point(0, 0);
+            this.vSplitContainer.Name = "vSplitContainer";
+            // 
+            // vSplitContainer.Panel1
+            // 
+            this.vSplitContainer.Panel1.Controls.Add(this.hSplitContainer);
+            this.vSplitContainer.Panel1MinSize = 100;
+            // 
+            // vSplitContainer.Panel2
+            // 
+            this.vSplitContainer.Panel2.Controls.Add(this.printerConfigBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.statisticsBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.printQueryResultsBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.exportQueryResultsBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.formatOfResultsBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.clearFiltersBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.settingsBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.saveConfigBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.loadConfigBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.executeQueryBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.addFilterBtn);
+            this.vSplitContainer.Panel2.Controls.Add(this.testBenchesGroupBox);
+            this.vSplitContainer.Panel2MinSize = 100;
+            this.vSplitContainer.Size = new System.Drawing.Size(984, 712);
+            this.vSplitContainer.SplitterDistance = 840;
+            this.vSplitContainer.TabIndex = 0;
+            // 
+            // hSplitContainer
+            // 
+            this.hSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.hSplitContainer.Location = new System.Drawing.Point(0, 0);
+            this.hSplitContainer.Name = "hSplitContainer";
+            this.hSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // hSplitContainer.Panel1
+            // 
+            this.hSplitContainer.Panel1.Controls.Add(this.filtersGroupBox);
+            // 
+            // hSplitContainer.Panel2
+            // 
+            this.hSplitContainer.Panel2.Controls.Add(this.resultsGroupBox);
+            this.hSplitContainer.Size = new System.Drawing.Size(840, 712);
+            this.hSplitContainer.SplitterDistance = 280;
+            this.hSplitContainer.TabIndex = 0;
+            // 
+            // filtersGroupBox
+            // 
+            this.filtersGroupBox.Controls.Add(this.filtersFlowLayoutPanel);
+            this.filtersGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.filtersGroupBox.Location = new System.Drawing.Point(0, 0);
+            this.filtersGroupBox.Name = "filtersGroupBox";
+            this.filtersGroupBox.Size = new System.Drawing.Size(840, 280);
+            this.filtersGroupBox.TabIndex = 1;
+            this.filtersGroupBox.TabStop = false;
+            this.filtersGroupBox.Text = "Filters";
+            // 
+            // filtersFlowLayoutPanel
+            // 
+            this.filtersFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.filtersFlowLayoutPanel.Location = new System.Drawing.Point(3, 16);
+            this.filtersFlowLayoutPanel.Name = "filtersFlowLayoutPanel";
+            this.filtersFlowLayoutPanel.Size = new System.Drawing.Size(834, 261);
+            this.filtersFlowLayoutPanel.TabIndex = 0;
+            // 
+            // resultsGroupBox
+            // 
+            this.resultsGroupBox.Controls.Add(this.resultsListView);
+            this.resultsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.resultsGroupBox.Location = new System.Drawing.Point(0, 0);
+            this.resultsGroupBox.Name = "resultsGroupBox";
+            this.resultsGroupBox.Size = new System.Drawing.Size(840, 428);
+            this.resultsGroupBox.TabIndex = 1;
+            this.resultsGroupBox.TabStop = false;
+            this.resultsGroupBox.Text = "Query results";
+            // 
+            // resultsListView
+            // 
+            this.resultsListView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.resultsListView.Location = new System.Drawing.Point(3, 16);
+            this.resultsListView.Name = "resultsListView";
+            this.resultsListView.Size = new System.Drawing.Size(834, 409);
+            this.resultsListView.TabIndex = 0;
+            this.resultsListView.UseCompatibleStateImageBehavior = false;
+            this.resultsListView.View = System.Windows.Forms.View.Details;
+            // 
+            // printerConfigBtn
+            // 
+            this.printerConfigBtn.Location = new System.Drawing.Point(8, 316);
+            this.printerConfigBtn.Name = "printerConfigBtn";
+            this.printerConfigBtn.Size = new System.Drawing.Size(125, 35);
+            this.printerConfigBtn.TabIndex = 11;
+            this.printerConfigBtn.Text = "Configure printer";
+            this.printerConfigBtn.UseVisualStyleBackColor = true;
+            this.printerConfigBtn.Click += new System.EventHandler(this.printerConfigBtn_Click);
+            // 
+            // statisticsBtn
+            // 
+            this.statisticsBtn.Location = new System.Drawing.Point(8, 621);
+            this.statisticsBtn.Name = "statisticsBtn";
+            this.statisticsBtn.Size = new System.Drawing.Size(125, 35);
+            this.statisticsBtn.TabIndex = 10;
+            this.statisticsBtn.Text = "Statistics";
+            this.statisticsBtn.UseVisualStyleBackColor = true;
+            this.statisticsBtn.Click += new System.EventHandler(this.statisticsBtn_Click);
+            // 
+            // printQueryResultsBtn
+            // 
+            this.printQueryResultsBtn.Location = new System.Drawing.Point(8, 548);
+            this.printQueryResultsBtn.Name = "printQueryResultsBtn";
+            this.printQueryResultsBtn.Size = new System.Drawing.Size(125, 35);
+            this.printQueryResultsBtn.TabIndex = 9;
+            this.printQueryResultsBtn.Text = "Print query results";
+            this.printQueryResultsBtn.UseVisualStyleBackColor = true;
+            this.printQueryResultsBtn.Click += new System.EventHandler(this.printQueryResultsBtn_Click);
+            // 
+            // exportQueryResultsBtn
+            // 
+            this.exportQueryResultsBtn.Location = new System.Drawing.Point(8, 508);
+            this.exportQueryResultsBtn.Name = "exportQueryResultsBtn";
+            this.exportQueryResultsBtn.Size = new System.Drawing.Size(125, 35);
+            this.exportQueryResultsBtn.TabIndex = 8;
+            this.exportQueryResultsBtn.Text = "Export query results";
+            this.exportQueryResultsBtn.UseVisualStyleBackColor = true;
+            this.exportQueryResultsBtn.Click += new System.EventHandler(this.exportQueryResultsBtn_Click);
+            // 
+            // formatOfResultsBtn
+            // 
+            this.formatOfResultsBtn.Location = new System.Drawing.Point(8, 276);
+            this.formatOfResultsBtn.Name = "formatOfResultsBtn";
+            this.formatOfResultsBtn.Size = new System.Drawing.Size(125, 35);
+            this.formatOfResultsBtn.TabIndex = 7;
+            this.formatOfResultsBtn.Text = "Configure output";
+            this.formatOfResultsBtn.UseVisualStyleBackColor = true;
+            this.formatOfResultsBtn.Click += new System.EventHandler(this.formatOfResultsBtn_Click);
+            // 
+            // clearFiltersBtn
+            // 
+            this.clearFiltersBtn.Location = new System.Drawing.Point(8, 196);
+            this.clearFiltersBtn.Name = "clearFiltersBtn";
+            this.clearFiltersBtn.Size = new System.Drawing.Size(125, 35);
+            this.clearFiltersBtn.TabIndex = 2;
+            this.clearFiltersBtn.Text = "Clear filters";
+            this.clearFiltersBtn.UseVisualStyleBackColor = true;
+            this.clearFiltersBtn.Click += new System.EventHandler(this.clearFiltersBtn_Click);
+            // 
+            // settingsBtn
+            // 
+            this.settingsBtn.Location = new System.Drawing.Point(8, 12);
+            this.settingsBtn.Name = "settingsBtn";
+            this.settingsBtn.Size = new System.Drawing.Size(125, 33);
+            this.settingsBtn.TabIndex = 0;
+            this.settingsBtn.Text = "Settings";
+            this.settingsBtn.UseVisualStyleBackColor = true;
+            this.settingsBtn.Click += new System.EventHandler(this.settingsBtn_Click);
+            // 
+            // saveConfigBtn
+            // 
+            this.saveConfigBtn.Location = new System.Drawing.Point(8, 356);
+            this.saveConfigBtn.Name = "saveConfigBtn";
+            this.saveConfigBtn.Size = new System.Drawing.Size(125, 35);
+            this.saveConfigBtn.TabIndex = 5;
+            this.saveConfigBtn.Text = "Save configuration";
+            this.saveConfigBtn.UseVisualStyleBackColor = true;
+            this.saveConfigBtn.Click += new System.EventHandler(this.saveConfigBtn_Click);
+            // 
+            // loadConfigBtn
+            // 
+            this.loadConfigBtn.Location = new System.Drawing.Point(8, 396);
+            this.loadConfigBtn.Name = "loadConfigBtn";
+            this.loadConfigBtn.Size = new System.Drawing.Size(125, 35);
+            this.loadConfigBtn.TabIndex = 4;
+            this.loadConfigBtn.Text = "Load configuration";
+            this.loadConfigBtn.UseVisualStyleBackColor = true;
+            this.loadConfigBtn.Click += new System.EventHandler(this.loadConfigBtn_Click);
+            // 
+            // executeQueryBtn
+            // 
+            this.executeQueryBtn.Location = new System.Drawing.Point(8, 468);
+            this.executeQueryBtn.Name = "executeQueryBtn";
+            this.executeQueryBtn.Size = new System.Drawing.Size(125, 35);
+            this.executeQueryBtn.TabIndex = 6;
+            this.executeQueryBtn.Text = "Execute query";
+            this.executeQueryBtn.UseVisualStyleBackColor = true;
+            this.executeQueryBtn.Click += new System.EventHandler(this.executeQueryBtn_Click);
+            // 
+            // addFilterBtn
+            // 
+            this.addFilterBtn.Location = new System.Drawing.Point(8, 236);
+            this.addFilterBtn.Name = "addFilterBtn";
+            this.addFilterBtn.Size = new System.Drawing.Size(125, 35);
+            this.addFilterBtn.TabIndex = 3;
+            this.addFilterBtn.Text = "Add filter";
+            this.addFilterBtn.UseVisualStyleBackColor = true;
+            this.addFilterBtn.Click += new System.EventHandler(this.addFilterBtn_Click);
+            // 
+            // testBenchesGroupBox
+            // 
+            this.testBenchesGroupBox.Controls.Add(this.checkBox6);
+            this.testBenchesGroupBox.Controls.Add(this.checkBox5);
+            this.testBenchesGroupBox.Controls.Add(this.checkBox4);
+            this.testBenchesGroupBox.Controls.Add(this.checkBox3);
+            this.testBenchesGroupBox.Controls.Add(this.checkBox2);
+            this.testBenchesGroupBox.Controls.Add(this.checkBox1);
+            this.testBenchesGroupBox.Location = new System.Drawing.Point(8, 54);
+            this.testBenchesGroupBox.Name = "testBenchesGroupBox";
+            this.testBenchesGroupBox.Size = new System.Drawing.Size(125, 135);
+            this.testBenchesGroupBox.TabIndex = 1;
+            this.testBenchesGroupBox.TabStop = false;
+            this.testBenchesGroupBox.Text = "Test benches";
+            // 
+            // checkBox6
+            // 
+            this.checkBox6.AutoSize = true;
+            this.checkBox6.Location = new System.Drawing.Point(23, 110);
+            this.checkBox6.Name = "checkBox6";
+            this.checkBox6.Size = new System.Drawing.Size(85, 17);
+            this.checkBox6.TabIndex = 5;
+            this.checkBox6.TabStop = true;
+            this.checkBox6.Text = "radioButton6";
+            this.checkBox6.UseVisualStyleBackColor = true;
+            this.checkBox6.CheckedChanged += new System.EventHandler(this.checkBox6_CheckedChanged);
+            // 
+            // checkBox5
+            // 
+            this.checkBox5.AutoSize = true;
+            this.checkBox5.Location = new System.Drawing.Point(23, 92);
+            this.checkBox5.Name = "checkBox5";
+            this.checkBox5.Size = new System.Drawing.Size(85, 17);
+            this.checkBox5.TabIndex = 4;
+            this.checkBox5.TabStop = true;
+            this.checkBox5.Text = "radioButton5";
+            this.checkBox5.UseVisualStyleBackColor = true;
+            this.checkBox5.CheckedChanged += new System.EventHandler(this.checkBox5_CheckedChanged);
+            // 
+            // checkBox4
+            // 
+            this.checkBox4.AutoSize = true;
+            this.checkBox4.Location = new System.Drawing.Point(23, 74);
+            this.checkBox4.Name = "checkBox4";
+            this.checkBox4.Size = new System.Drawing.Size(85, 17);
+            this.checkBox4.TabIndex = 3;
+            this.checkBox4.TabStop = true;
+            this.checkBox4.Text = "radioButton4";
+            this.checkBox4.UseVisualStyleBackColor = true;
+            this.checkBox4.CheckedChanged += new System.EventHandler(this.checkBox4_CheckedChanged);
+            // 
+            // checkBox3
+            // 
+            this.checkBox3.AutoSize = true;
+            this.checkBox3.Location = new System.Drawing.Point(23, 55);
+            this.checkBox3.Name = "checkBox3";
+            this.checkBox3.Size = new System.Drawing.Size(85, 17);
+            this.checkBox3.TabIndex = 2;
+            this.checkBox3.TabStop = true;
+            this.checkBox3.Text = "radioButton3";
+            this.checkBox3.UseVisualStyleBackColor = true;
+            this.checkBox3.CheckedChanged += new System.EventHandler(this.checkBox3_CheckedChanged);
+            // 
+            // checkBox2
+            // 
+            this.checkBox2.AutoSize = true;
+            this.checkBox2.Location = new System.Drawing.Point(23, 36);
+            this.checkBox2.Name = "checkBox2";
+            this.checkBox2.Size = new System.Drawing.Size(85, 17);
+            this.checkBox2.TabIndex = 1;
+            this.checkBox2.TabStop = true;
+            this.checkBox2.Text = "radioButton2";
+            this.checkBox2.UseVisualStyleBackColor = true;
+            this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
+            // 
+            // checkBox1
+            // 
+            this.checkBox1.AutoSize = true;
+            this.checkBox1.Location = new System.Drawing.Point(23, 17);
+            this.checkBox1.Name = "checkBox1";
+            this.checkBox1.Size = new System.Drawing.Size(85, 17);
+            this.checkBox1.TabIndex = 0;
+            this.checkBox1.TabStop = true;
+            this.checkBox1.Text = "radioButton1";
+            this.checkBox1.UseVisualStyleBackColor = true;
+            this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
+            // 
+            // ResultsBrowserWnd
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(984, 712);
+            this.Controls.Add(this.vSplitContainer);
+            this.Name = "ResultsBrowserWnd";
+            this.Text = "Results Browser";
+            this.Load += new System.EventHandler(this.ResultsBrowserWnd_Load);
+            this.vSplitContainer.Panel1.ResumeLayout(false);
+            this.vSplitContainer.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.vSplitContainer)).EndInit();
+            this.vSplitContainer.ResumeLayout(false);
+            this.hSplitContainer.Panel1.ResumeLayout(false);
+            this.hSplitContainer.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.hSplitContainer)).EndInit();
+            this.hSplitContainer.ResumeLayout(false);
+            this.filtersGroupBox.ResumeLayout(false);
+            this.resultsGroupBox.ResumeLayout(false);
+            this.testBenchesGroupBox.ResumeLayout(false);
+            this.testBenchesGroupBox.PerformLayout();
+            this.ResumeLayout(false);
 
         }
 
@@ -387,5 +401,6 @@
         private System.Windows.Forms.RadioButton checkBox5;
         private System.Windows.Forms.RadioButton checkBox4;
 		private System.Windows.Forms.Button printerConfigBtn;
+        private System.Windows.Forms.RadioButton checkBox6;
     }
 }

ResultsBrowser/ResultsBrowserWnd.cs

@@ -62,6 +62,7 @@ namespace ResultsBrowser
             checkBox3.Checked = Program.LocalSettings.Bench3Selected;
             checkBox4.Checked = Program.LocalSettings.Bench4Selected;
             checkBox5.Checked = Program.LocalSettings.Bench5Selected;
+            checkBox6.Checked = Program.LocalSettings.Bench6Selected;
 
             if (args.Length == 1 && args[0].IndexOf(".qry") == args[0].Length - 4)
             {
@@ -84,19 +85,24 @@ namespace ResultsBrowser
             checkBox3.Text = Program.LocalSettings.Bench3;
             checkBox4.Text = Program.LocalSettings.Bench4;
             checkBox5.Text = Program.LocalSettings.Bench5;
+            checkBox6.Text = Program.LocalSettings.Bench6;
 
             checkBox1.Visible = !string.IsNullOrEmpty(checkBox1.Text);
             checkBox2.Visible = !string.IsNullOrEmpty(checkBox2.Text);
             checkBox3.Visible = !string.IsNullOrEmpty(checkBox3.Text);
             checkBox4.Visible = !string.IsNullOrEmpty(checkBox4.Text);
             checkBox5.Visible = !string.IsNullOrEmpty(checkBox5.Text);
+            checkBox6.Visible = !string.IsNullOrEmpty(checkBox6.Text);
         }
 
 		string BenchName()
 		{
 			return checkBox1.Checked ? Program.LocalSettings.Bench1
-									 : checkBox2.Checked ? Program.LocalSettings.Bench2
-														 : Program.LocalSettings.Bench3;
+ 				 : checkBox2.Checked ? Program.LocalSettings.Bench2
+				 : checkBox3.Checked ? Program.LocalSettings.Bench3
+				 : checkBox4.Checked ? Program.LocalSettings.Bench4
+                 : checkBox5.Checked ? Program.LocalSettings.Bench5
+                 : Program.LocalSettings.Bench6;
 		}
 
         void Localize()
@@ -133,6 +139,7 @@ namespace ResultsBrowser
         private void checkBox3_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
         private void checkBox4_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
         private void checkBox5_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
+        private void checkBox6_CheckedChanged(object sender, EventArgs e) { SaveCheckBoxes(); }
 
         void SaveCheckBoxes()
         {
@@ -141,6 +148,7 @@ namespace ResultsBrowser
             Program.LocalSettings.Bench3Selected = checkBox3.Checked;
             Program.LocalSettings.Bench4Selected = checkBox4.Checked;
             Program.LocalSettings.Bench5Selected = checkBox5.Checked;
+            Program.LocalSettings.Bench6Selected = checkBox6.Checked;
             Program.LocalSettings.Save();
         }
 
@@ -269,7 +277,8 @@ namespace ResultsBrowser
                                              (checkBox3.Checked ? Program.LocalSettings.ConnectionString3 :
                                              (checkBox4.Checked ? Program.LocalSettings.ConnectionString4 :
                                              (checkBox5.Checked ? Program.LocalSettings.ConnectionString5 :
-                                                                  Program.LocalSettings.ConnectionString1))));
+                                             (checkBox6.Checked ? Program.LocalSettings.ConnectionString6 :
+                                                                  Program.LocalSettings.ConnectionString1)))));
 
                 ISession[] sessions = new ISession[] { Results.DB.CreateSession() };
 

Statistics/Forms/ModelessForm.Designer.cs

@@ -0,0 +1,64 @@
+namespace Statistics.Forms
+{
+    partial class ModelessForm
+    {
+        /// <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.label1 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(47, 29);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(35, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "label1";
+            // 
+            // ModelessForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(191, 56);
+            this.Controls.Add(this.label1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Name = "ModelessForm";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "ModelessForm";
+            this.Load += new System.EventHandler(this.ModelessForm_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+    }
+}

Statistics/Forms/ModelessForm.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Statistics.Forms
+{
+    public partial class ModelessForm : Form
+    {
+        /// <summary>
+        /// Called from the state machine when an operation forces a modeless dialog close.
+        /// </summary>
+        public static void CloseForm()
+        {
+            if (CloseFormHandler == null) return;
+            try { CloseFormHandler(null, null); }
+            catch (Exception) { }
+        }
+        public static event EventHandler<EventArgs> CloseFormHandler;
+
+        void OnCloseForm(object sender, EventArgs args)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+
+        public string Title;
+        public string Message;
+        public Color BackgroundColor;
+        public Color TextColor;
+        public Font TextFont;
+        public string FontFamily;
+        public int FontSize;
+        public FontStyle FontStyle;
+
+
+        /// <summary>
+        /// Constructor to be used by the application
+        /// </summary>
+        /// <param name="title">Window title</param>
+        /// <param name="message">Displayed message</param>
+        public ModelessForm()
+        {
+            InitializeComponent();
+            ControlBox = false;
+
+            CloseFormHandler += delegate(object sender, EventArgs args)
+            {
+                if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnCloseForm), sender, args); }
+                else OnCloseForm(sender, args);
+            };
+        }
+
+        private void ModelessForm_Load(object sender, EventArgs e)
+        {
+            if (Title != null) Text = Title;
+            if (Message != null) label1.Text = Message;
+            if (BackgroundColor != null) BackColor = BackgroundColor;
+            if (TextColor != null) ForeColor = TextColor;
+            if (FontFamily != null) label1.Font = new Font(FontFamily, FontSize, FontStyle);
+
+            float textWidth = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Width;
+            float textHeight = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Height;
+            Width = (int)textWidth + 120;		/// Form width calculated from the text width
+            Height += (int)textHeight;		    /// Form height calculated from the text height
+        }
+    }
+}

Statistics/Forms/ModelessForm.resx

@@ -0,0 +1,120 @@
+<?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>

Statistics/LocalSettings.cs

@@ -0,0 +1,257 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace Statistics
+{
+    /// <summary>
+    /// Class to be serialized to an XML file...
+    /// Public members are local settings.
+    /// These settings are modified by dialogs invoked by menu items
+    ///   Edit->Preferences ... PreferencesDlg ... S1.1(language, etc. local settings), and
+    ///   Edit->Advanced settings ... AdvancedSettingsDlg ... S1.2(spec. where bench settings are stored)
+    /// </summary>
+    [XmlRootAttribute("Statistics")]
+    public class LocalSettings
+    {
+        public const int BenchesCount = 6;
+        public const int FlowsCount = 5;
+
+
+        /// <summary>
+		/// User interface language (used as CultureInfo(..) constructor argument).
+		/// </summary>
+        public string Language;
+
+        ///
+        /// Names of test benches
+        ///
+        public string[] BenchNames;
+        /// 
+        public string GetBenchName(int i)
+        {
+            return ((BenchNames != null) && (i >= 0) && (i < BenchNames.Length)) ? BenchNames[i] : string.Empty;
+        }
+
+        ///
+        /// Database settings of servers
+        ///
+        public string[] ConnectionStrings;
+        /// 
+        public string GetConnectionString(int i)
+        {
+            return ((ConnectionStrings != null) && (i >= 0) && (i < ConnectionStrings.Length)) ? ConnectionStrings[i] : string.Empty;
+        }
+
+        ///
+        /// Flow settings
+        ///
+        public bool[] FlowEnabledWMs;
+        public bool[] FlowEnabledI1;
+        public bool[] FlowEnabledI2;
+        public bool[] FlowEnabledI3;
+        public bool[] FlowEnabledI4;
+        /// 
+        public bool GetFlowEnabled(UserControls.MidId midId, int i)
+        {
+            switch (midId)
+            {
+                case UserControls.MidId.WaterMeters:
+                    return ((FlowEnabledWMs != null) && (i >= 0) && (i < FlowEnabledWMs.Length)) ? FlowEnabledWMs[i] : false;
+                case UserControls.MidId.I1: return ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) ? FlowEnabledI1[i] : false;
+                case UserControls.MidId.I2: return ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) ? FlowEnabledI2[i] : false;
+                case UserControls.MidId.I3: return ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) ? FlowEnabledI3[i] : false;
+                case UserControls.MidId.I4: return ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) ? FlowEnabledI4[i] : false;
+                default:                    
+                    return false;
+            }
+        }
+        /// 
+        public void SetFlowEnabled(UserControls.MidId midId, int i, bool value)
+        {
+            switch (midId)
+            {
+                case UserControls.MidId.WaterMeters:
+                    if ((FlowEnabledWMs != null) && (i >= 0) && (i < FlowEnabledWMs.Length)) { FlowEnabledWMs[i] = value; };
+                    break;
+                case UserControls.MidId.I1: if ((FlowEnabledI1 != null) && (i >= 0) && (i < FlowEnabledI1.Length)) { FlowEnabledI1[i] = value; }; break;
+                case UserControls.MidId.I2: if ((FlowEnabledI2 != null) && (i >= 0) && (i < FlowEnabledI2.Length)) { FlowEnabledI2[i] = value; }; break;
+                case UserControls.MidId.I3: if ((FlowEnabledI3 != null) && (i >= 0) && (i < FlowEnabledI3.Length)) { FlowEnabledI3[i] = value; }; break;
+                case UserControls.MidId.I4: if ((FlowEnabledI4 != null) && (i >= 0) && (i < FlowEnabledI4.Length)) { FlowEnabledI4[i] = value; }; break;
+                default:
+                    break;
+            }
+        }
+
+        public double[] FlowFromWMs;
+        public double[] FlowFromI1;
+        public double[] FlowFromI2;
+        public double[] FlowFromI3;
+        public double[] FlowFromI4;
+        /// 
+        public double GetFlowFrom(UserControls.MidId midId, int i)
+        {
+            switch (midId)
+            {
+                case UserControls.MidId.WaterMeters:
+                    return ((FlowFromWMs != null) && (i >= 0) && (i < FlowFromWMs.Length)) ? FlowFromWMs[i] : 0;
+                case UserControls.MidId.I1: return ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) ? FlowFromI1[i] : 0;
+                case UserControls.MidId.I2: return ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) ? FlowFromI2[i] : 0;
+                case UserControls.MidId.I3: return ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) ? FlowFromI3[i] : 0;
+                case UserControls.MidId.I4: return ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) ? FlowFromI4[i] : 0;
+                default:
+                    return 0;
+            }
+        }
+        /// 
+        public void SetFlowFrom(UserControls.MidId midId, int i, double value)
+        {
+            switch (midId)
+            {
+                case UserControls.MidId.WaterMeters:
+                    if ((FlowFromWMs != null) && (i >= 0) && (i < FlowFromWMs.Length)) { FlowFromWMs[i] = value; };
+                    break;
+                case UserControls.MidId.I1: if ((FlowFromI1 != null) && (i >= 0) && (i < FlowFromI1.Length)) { FlowFromI1[i] = value; }; break;
+                case UserControls.MidId.I2: if ((FlowFromI2 != null) && (i >= 0) && (i < FlowFromI2.Length)) { FlowFromI2[i] = value; }; break;
+                case UserControls.MidId.I3: if ((FlowFromI3 != null) && (i >= 0) && (i < FlowFromI3.Length)) { FlowFromI3[i] = value; }; break;
+                case UserControls.MidId.I4: if ((FlowFromI4 != null) && (i >= 0) && (i < FlowFromI4.Length)) { FlowFromI4[i] = value; }; break;
+                default:
+                    break;
+            }
+        }
+
+        public double[] FlowToWMs;
+        public double[] FlowToI1;
+        public double[] FlowToI2;
+        public double[] FlowToI3;
+        public double[] FlowToI4;
+        /// 
+        public double GetFlowTo(UserControls.MidId midId, int i)
+        {
+            switch (midId)
+            {
+                case UserControls.MidId.WaterMeters:
+                    return ((FlowToWMs != null) && (i >= 0) && (i < FlowToWMs.Length)) ? FlowToWMs[i] : 0;
+                case UserControls.MidId.I1: return ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) ? FlowToI1[i] : 0;
+                case UserControls.MidId.I2: return ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) ? FlowToI2[i] : 0;
+                case UserControls.MidId.I3: return ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) ? FlowToI3[i] : 0;
+                case UserControls.MidId.I4: return ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) ? FlowToI4[i] : 0;
+                default:
+                    return 0;
+            }
+        }
+        /// 
+        public void SetFlowTo(UserControls.MidId midId, int i, double value)
+        {
+            switch (midId)
+            {
+                case UserControls.MidId.WaterMeters:
+                    if ((FlowToWMs != null) && (i >= 0) && (i < FlowToWMs.Length)) { FlowToWMs[i] = value; };
+                    break;
+                case UserControls.MidId.I1: if ((FlowToI1 != null) && (i >= 0) && (i < FlowToI1.Length)) { FlowToI1[i] = value; }; break;
+                case UserControls.MidId.I2: if ((FlowToI2 != null) && (i >= 0) && (i < FlowToI2.Length)) { FlowToI2[i] = value; }; break;
+                case UserControls.MidId.I3: if ((FlowToI3 != null) && (i >= 0) && (i < FlowToI3.Length)) { FlowToI3[i] = value; }; break;
+                case UserControls.MidId.I4: if ((FlowToI4 != null) && (i >= 0) && (i < FlowToI4.Length)) { FlowToI4[i] = value; }; break;
+                default:
+                    break;
+            }
+        }
+
+
+        /// StatisticsDlg UI
+        public int SelectedRadioButtonNumber;
+
+
+        /// MainWnd
+        public int MainWndLeft;
+        public int MainWndTop;
+        public int MainWndWidth;
+        public int MainWndHeight;
+        public bool ManiWndMaximized;
+        public int SplitterDistance;
+
+		
+        /// <summary>
+        /// Default constructor which is used to create default settings
+        /// </summary>
+        public LocalSettings()
+        {
+            Language = "SK";
+
+            BenchNames = new string[] { "WR10", "WR11", "WR13", "WR14", "WR15", "PT7" };
+
+            ConnectionStrings = new string[]
+            {
+                "SERVER=10.42.128.93; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
+                "SERVER=10.42.128.102; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
+                "SERVER=10.42.128.89; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
+                "SERVER=10.42.128.213; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
+                "SERVER=10.42.128.214; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
+                "SERVER=10.42.129.26; DATABASE=iperlspecial-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
+            };
+
+            FlowEnabledWMs = new bool[FlowsCount];
+            FlowEnabledI1 = new bool[FlowsCount];
+            FlowEnabledI2 = new bool[FlowsCount];
+            FlowEnabledI3 = new bool[FlowsCount];
+            FlowEnabledI4 = new bool[FlowsCount];
+
+            FlowFromWMs = new double[FlowsCount];
+            FlowFromI1 = new double[FlowsCount];
+            FlowFromI2 = new double[FlowsCount];
+            FlowFromI3 = new double[FlowsCount];
+            FlowFromI4 = new double[FlowsCount];
+
+            FlowToWMs = new double[FlowsCount];
+            FlowToI1 = new double[FlowsCount];
+            FlowToI2 = new double[FlowsCount];
+            FlowToI3 = new double[FlowsCount];
+            FlowToI4 = new double[FlowsCount];
+
+            SelectedRadioButtonNumber = 1;
+        }
+
+        /// <summary>
+        /// Load local settings (public fields of this class) from the XML file.
+        /// </summary>
+		public static LocalSettings Load(string fileName)
+        {
+            try
+            {
+				using (TextReader reader = new StreamReader(fileName))
+				{
+                    LocalSettings ls = (new XmlSerializer(typeof(LocalSettings))).Deserialize(reader) as LocalSettings;
+                    // Copy the settings just in case De-serialize() completes OK
+                    return ls;
+                }
+            }
+            catch (Exception e)
+            {
+                string msg = e.Message;
+				return null;
+            }
+        }
+
+        /// <summary>
+        /// Save local settings (public fields of this class) to the XML file.
+        /// </summary>
+        public void Save()
+        {
+            try
+            {
+				using (TextWriter writer = new StreamWriter(Program.LocalSettingsFileName))
+                {
+                    (new XmlSerializer(typeof(LocalSettings))).Serialize(writer, this);
+                }
+            }
+            catch (Exception e)
+            {
+                string msg = e.Message;
+            }
+        }
+	}
+}

Statistics/Program.cs

@@ -0,0 +1,101 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+using System.Windows.Forms;
+using Statistics.Resources;
+
+namespace Statistics
+{
+    static class Program
+    {
+        /// Program information
+        public static string Version;			/// version string
+        public static DateTime BuildDateTime;	/// date and time of program build
+
+        /// Local settings
+        public static string ExecutableDirectory;
+        public static string ConfigDirectory;
+        public static string LocalSettingsFileName;
+        public static string LocalSettingsBackupName;
+        public static LocalSettings LocalSettings;
+
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main(string[] args)
+        {
+            /// Program version string
+            System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
+            Version ver = thisAssembly.GetName().Version;
+            Version = string.Format("{0}.{1}.{2}", ver.Major, ver.Minor, ver.Build);
+            BuildDateTime = new System.IO.FileInfo(thisAssembly.Location).LastWriteTime;
+
+            /// Local program configuration directory including the trailing backslash
+            ExecutableDirectory = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+#if false
+            /// Config directory is a sibling directory of the executable directory 
+            ConfigDirectory = Path.Combine(ExecutableDirectory, "..", string.Format("Cfg{0}", (args.Length >= 1) ? args[0] : string.Empty));
+#else
+            /// Config directory is a directory in 'C:\Users\username\AppData\Local' folder
+            ConfigDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                                           string.Format("Statistics{0}", (args.Length >= 1) ? args[0] : string.Empty));
+#endif
+            LocalSettingsFileName = Path.Combine(ConfigDirectory, "config.xml");
+            LocalSettingsBackupName = Path.Combine(ConfigDirectory, "config.backup.xml");
+
+            ///
+            /// Load the local settings
+            ///
+            LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
+            if (LocalSettings == null)
+            {
+                /// Loading local seetings from regular config file failed. Use the backup
+                LocalSettings = LocalSettings.Load(Program.LocalSettingsBackupName);
+                if (LocalSettings == null)
+                {
+                    MessageBox.Show(Strings.No_program_settings_found + Strings.Using_default_settings,
+                                    string.Empty,
+                                    MessageBoxButtons.OK,
+                                    MessageBoxIcon.Information);
+
+                    /// Create new default settings and save them
+                    LocalSettings = new LocalSettings();
+                    Directory.CreateDirectory(ConfigDirectory);
+                    LocalSettings.Save();
+                }
+                else
+                {
+                    LocalSettings.Save();	/// Save the settings to overwrite the wrong file
+                }
+            }
+            else
+            {
+                /// Loading local seetings from the regular config file was successful. Update the backup
+                File.Copy(Program.LocalSettingsFileName, Program.LocalSettingsBackupName, true);
+            }
+
+            try
+            {
+                string culture = LocalSettings.Language.Replace('_', '-');
+                System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(culture);
+            }
+            catch (Exception e)
+            {
+                string msg = e.Message;
+                MessageBox.Show(Strings.Selected_language_not_supported + Environment.NewLine + Strings.Using_English,
+                                Strings.Warning,
+                                MessageBoxButtons.OK,
+                                MessageBoxIcon.Asterisk);
+                System.Threading.Thread.CurrentThread.CurrentUICulture =
+                    new System.Globalization.CultureInfo("en");
+            }
+
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new StatisticsDlg());
+        }
+    }
+}

Statistics/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Statistics")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Statistics")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("9e674819-ed89-4d9a-a4e8-3bf2cc69cfc2")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// 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.1108.0")]
+[assembly: AssemblyFileVersion("2.18.1108.0")]

Statistics/Properties/Resources.Designer.cs

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

Statistics/Properties/Resources.resx

@@ -0,0 +1,117 @@
+<?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.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: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" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </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" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Statistics/Properties/Settings.Designer.cs

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

Statistics/Properties/Settings.settings

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

Statistics/Resources/Strings.Designer.cs

@@ -0,0 +1,207 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Statistics.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Strings {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Strings() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Statistics.Resources.Strings", typeof(Strings).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Flow.
+        /// </summary>
+        internal static string Flow {
+            get {
+                return ResourceManager.GetString("Flow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to From.
+        /// </summary>
+        internal static string From {
+            get {
+                return ResourceManager.GetString("From", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to From / to.
+        /// </summary>
+        internal static string From_to {
+            get {
+                return ResourceManager.GetString("From_to", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Last 3 months.
+        /// </summary>
+        internal static string Last_3_months {
+            get {
+                return ResourceManager.GetString("Last_3_months", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Last month.
+        /// </summary>
+        internal static string Last_month {
+            get {
+                return ResourceManager.GetString("Last_month", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Last week.
+        /// </summary>
+        internal static string Last_week {
+            get {
+                return ResourceManager.GetString("Last_week", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No program settings found..
+        /// </summary>
+        internal static string No_program_settings_found {
+            get {
+                return ResourceManager.GetString("No_program_settings_found", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to searching....
+        /// </summary>
+        internal static string searching_ {
+            get {
+                return ResourceManager.GetString("searching_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Selected language is not supported..
+        /// </summary>
+        internal static string Selected_language_not_supported {
+            get {
+                return ResourceManager.GetString("Selected_language_not_supported", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Statistics.
+        /// </summary>
+        internal static string Statistics {
+            get {
+                return ResourceManager.GetString("Statistics", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Time period.
+        /// </summary>
+        internal static string Time_period {
+            get {
+                return ResourceManager.GetString("Time_period", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to To.
+        /// </summary>
+        internal static string To {
+            get {
+                return ResourceManager.GetString("To", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Default settings are used..
+        /// </summary>
+        internal static string Using_default_settings {
+            get {
+                return ResourceManager.GetString("Using_default_settings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to English will be used..
+        /// </summary>
+        internal static string Using_English {
+            get {
+                return ResourceManager.GetString("Using_English", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Warning.
+        /// </summary>
+        internal static string Warning {
+            get {
+                return ResourceManager.GetString("Warning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Water meters.
+        /// </summary>
+        internal static string Water_meters {
+            get {
+                return ResourceManager.GetString("Water_meters", resourceCulture);
+            }
+        }
+    }
+}

Statistics/Resources/Strings.resx

@@ -0,0 +1,168 @@
+<?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>
+  <data name="Flow" xml:space="preserve">
+    <value>Flow</value>
+  </data>
+  <data name="From" xml:space="preserve">
+    <value>From</value>
+  </data>
+  <data name="searching_" xml:space="preserve">
+    <value>searching...</value>
+  </data>
+  <data name="Statistics" xml:space="preserve">
+    <value>Statistics</value>
+  </data>
+  <data name="Time_period" xml:space="preserve">
+    <value>Time period</value>
+  </data>
+  <data name="To" xml:space="preserve">
+    <value>To</value>
+  </data>
+  <data name="Water_meters" xml:space="preserve">
+    <value>Water meters</value>
+  </data>
+  <data name="From_to" xml:space="preserve">
+    <value>From / to</value>
+  </data>
+  <data name="Last_3_months" xml:space="preserve">
+    <value>Last 3 months</value>
+  </data>
+  <data name="Last_month" xml:space="preserve">
+    <value>Last month</value>
+  </data>
+  <data name="Last_week" xml:space="preserve">
+    <value>Last week</value>
+  </data>
+  <data name="No_program_settings_found" xml:space="preserve">
+    <value>No program settings found.</value>
+  </data>
+  <data name="Selected_language_not_supported" xml:space="preserve">
+    <value>Selected language is not supported.</value>
+  </data>
+  <data name="Using_default_settings" xml:space="preserve">
+    <value>Default settings are used.</value>
+  </data>
+  <data name="Using_English" xml:space="preserve">
+    <value>English will be used.</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+</root>

Statistics/Resources/Strings.sk.resx

@@ -0,0 +1,162 @@
+<?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>
+  <data name="Flow" xml:space="preserve">
+    <value>Prietok</value>
+  </data>
+  <data name="From" xml:space="preserve">
+    <value>Od</value>
+  </data>
+  <data name="searching_" xml:space="preserve">
+    <value>hľadám...</value>
+  </data>
+  <data name="Statistics" xml:space="preserve">
+    <value>Štatistiky</value>
+  </data>
+  <data name="Time_period" xml:space="preserve">
+    <value>Časový úsek</value>
+  </data>
+  <data name="To" xml:space="preserve">
+    <value>Do</value>
+  </data>
+  <data name="Water_meters" xml:space="preserve">
+    <value>Vodomery</value>
+  </data>
+  <data name="From_to" xml:space="preserve">
+    <value>Od  / do</value>
+  </data>
+  <data name="Last_3_months" xml:space="preserve">
+    <value>Posledné 3 mesiace</value>
+  </data>
+  <data name="Last_month" xml:space="preserve">
+    <value>Posledný mesiac</value>
+  </data>
+  <data name="Last_week" xml:space="preserve">
+    <value>Posledný týždeň</value>
+  </data>
+  <data name="No_program_settings_found" xml:space="preserve">
+    <value>Nebola nájdená konfigurácia programu.</value>
+  </data>
+  <data name="Using_default_settings" xml:space="preserve">
+    <value>Použijú sa štandardné nastavenia.</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Upozornenie</value>
+  </data>
+</root>

Statistics/Statistics.csproj

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Statistics</RootNamespace>
+    <AssemblyName>Statistics</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FluentNHibernate">
+      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections">
+      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data">
+      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate">
+      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms.DataVisualization" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Forms\ModelessForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\ModelessForm.designer.cs">
+      <DependentUpon>ModelessForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LocalSettings.cs" />
+    <Compile Include="Resources\Strings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </Compile>
+    <Compile Include="StatisticsDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="StatisticsDlg.Designer.cs">
+      <DependentUpon>StatisticsDlg.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UserControls\Enums.cs" />
+    <Compile Include="UserControls\MidOrWaterMetersCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControls\MidOrWaterMetersCtrl.Designer.cs">
+      <DependentUpon>MidOrWaterMetersCtrl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControls\StatisticsCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControls\StatisticsCtrl.Designer.cs">
+      <DependentUpon>StatisticsCtrl.cs</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="Forms\ModelessForm.resx">
+      <DependentUpon>ModelessForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.sk.resx" />
+    <EmbeddedResource Include="StatisticsDlg.resx">
+      <DependentUpon>StatisticsDlg.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <EmbeddedResource Include="UserControls\MidOrWaterMetersCtrl.resx">
+      <DependentUpon>MidOrWaterMetersCtrl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControls\StatisticsCtrl.resx">
+      <DependentUpon>StatisticsCtrl.cs</DependentUpon>
+    </EmbeddedResource>
+    <None Include="app.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Results\Results.csproj">
+      <Project>{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}</Project>
+      <Name>Results</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Statistics/StatisticsDlg.Designer.cs

@@ -0,0 +1,339 @@
+namespace Statistics
+{
+    partial class StatisticsDlg
+    {
+        /// <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.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.radioButton4 = new System.Windows.Forms.RadioButton();
+            this.radioButton3 = new System.Windows.Forms.RadioButton();
+            this.radioButton2 = new System.Windows.Forms.RadioButton();
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.timePeriodGroupBox = new System.Windows.Forms.GroupBox();
+            this.toLabel1 = new System.Windows.Forms.Label();
+            this.fromLabel1 = new System.Windows.Forms.Label();
+            this.dateTimeFromPicker = new System.Windows.Forms.DateTimePicker();
+            this.dateTimeToPicker = new System.Windows.Forms.DateTimePicker();
+            this.midsTabControl = new System.Windows.Forms.TabControl();
+            this.wr10TabPage = new System.Windows.Forms.TabPage();
+            this.wmsBenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr11TabPage = new System.Windows.Forms.TabPage();
+            this.i1BenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr13TabPage = new System.Windows.Forms.TabPage();
+            this.i2BbenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr14TabPage = new System.Windows.Forms.TabPage();
+            this.i3BenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            this.wr15TabPage = new System.Windows.Forms.TabPage();
+            this.i4BenchesControl = new Statistics.UserControls.MidOrWaterMetersCtrl();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.timePeriodGroupBox.SuspendLayout();
+            this.midsTabControl.SuspendLayout();
+            this.wr10TabPage.SuspendLayout();
+            this.wr11TabPage.SuspendLayout();
+            this.wr13TabPage.SuspendLayout();
+            this.wr14TabPage.SuspendLayout();
+            this.wr15TabPage.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.IsSplitterFixed = true;
+            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.radioButton4);
+            this.splitContainer1.Panel1.Controls.Add(this.radioButton3);
+            this.splitContainer1.Panel1.Controls.Add(this.radioButton2);
+            this.splitContainer1.Panel1.Controls.Add(this.radioButton1);
+            this.splitContainer1.Panel1.Controls.Add(this.timePeriodGroupBox);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.midsTabControl);
+            this.splitContainer1.Size = new System.Drawing.Size(1368, 826);
+            this.splitContainer1.SplitterDistance = 90;
+            this.splitContainer1.TabIndex = 0;
+            // 
+            // radioButton4
+            // 
+            this.radioButton4.AutoSize = true;
+            this.radioButton4.Location = new System.Drawing.Point(136, 12);
+            this.radioButton4.Name = "radioButton4";
+            this.radioButton4.Size = new System.Drawing.Size(68, 17);
+            this.radioButton4.TabIndex = 6;
+            this.radioButton4.TabStop = true;
+            this.radioButton4.Text = "From / to";
+            this.radioButton4.UseVisualStyleBackColor = true;
+            this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged);
+            // 
+            // radioButton3
+            // 
+            this.radioButton3.AutoSize = true;
+            this.radioButton3.Location = new System.Drawing.Point(12, 58);
+            this.radioButton3.Name = "radioButton3";
+            this.radioButton3.Size = new System.Drawing.Size(91, 17);
+            this.radioButton3.TabIndex = 5;
+            this.radioButton3.TabStop = true;
+            this.radioButton3.Text = "Last 3 months";
+            this.radioButton3.UseVisualStyleBackColor = true;
+            // 
+            // radioButton2
+            // 
+            this.radioButton2.AutoSize = true;
+            this.radioButton2.Location = new System.Drawing.Point(12, 35);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(77, 17);
+            this.radioButton2.TabIndex = 4;
+            this.radioButton2.TabStop = true;
+            this.radioButton2.Text = "Last month";
+            this.radioButton2.UseVisualStyleBackColor = true;
+            // 
+            // radioButton1
+            // 
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.Location = new System.Drawing.Point(12, 12);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(74, 17);
+            this.radioButton1.TabIndex = 3;
+            this.radioButton1.TabStop = true;
+            this.radioButton1.Text = "Last week";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            // 
+            // timePeriodGroupBox
+            // 
+            this.timePeriodGroupBox.Controls.Add(this.toLabel1);
+            this.timePeriodGroupBox.Controls.Add(this.fromLabel1);
+            this.timePeriodGroupBox.Controls.Add(this.dateTimeFromPicker);
+            this.timePeriodGroupBox.Controls.Add(this.dateTimeToPicker);
+            this.timePeriodGroupBox.Location = new System.Drawing.Point(210, 10);
+            this.timePeriodGroupBox.Name = "timePeriodGroupBox";
+            this.timePeriodGroupBox.Size = new System.Drawing.Size(296, 74);
+            this.timePeriodGroupBox.TabIndex = 2;
+            this.timePeriodGroupBox.TabStop = false;
+            // 
+            // toLabel1
+            // 
+            this.toLabel1.AutoSize = true;
+            this.toLabel1.Location = new System.Drawing.Point(31, 48);
+            this.toLabel1.Name = "toLabel1";
+            this.toLabel1.Size = new System.Drawing.Size(20, 13);
+            this.toLabel1.TabIndex = 3;
+            this.toLabel1.Text = "To";
+            // 
+            // fromLabel1
+            // 
+            this.fromLabel1.AutoSize = true;
+            this.fromLabel1.Location = new System.Drawing.Point(31, 23);
+            this.fromLabel1.Name = "fromLabel1";
+            this.fromLabel1.Size = new System.Drawing.Size(30, 13);
+            this.fromLabel1.TabIndex = 2;
+            this.fromLabel1.Text = "From";
+            // 
+            // dateTimeFromPicker
+            // 
+            this.dateTimeFromPicker.Location = new System.Drawing.Point(81, 19);
+            this.dateTimeFromPicker.Name = "dateTimeFromPicker";
+            this.dateTimeFromPicker.Size = new System.Drawing.Size(200, 20);
+            this.dateTimeFromPicker.TabIndex = 0;
+            // 
+            // dateTimeToPicker
+            // 
+            this.dateTimeToPicker.Location = new System.Drawing.Point(81, 44);
+            this.dateTimeToPicker.Name = "dateTimeToPicker";
+            this.dateTimeToPicker.Size = new System.Drawing.Size(200, 20);
+            this.dateTimeToPicker.TabIndex = 1;
+            // 
+            // midsTabControl
+            // 
+            this.midsTabControl.Controls.Add(this.wr10TabPage);
+            this.midsTabControl.Controls.Add(this.wr11TabPage);
+            this.midsTabControl.Controls.Add(this.wr13TabPage);
+            this.midsTabControl.Controls.Add(this.wr14TabPage);
+            this.midsTabControl.Controls.Add(this.wr15TabPage);
+            this.midsTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.midsTabControl.Location = new System.Drawing.Point(0, 0);
+            this.midsTabControl.Name = "midsTabControl";
+            this.midsTabControl.SelectedIndex = 0;
+            this.midsTabControl.Size = new System.Drawing.Size(1368, 732);
+            this.midsTabControl.TabIndex = 0;
+            // 
+            // wr10TabPage
+            // 
+            this.wr10TabPage.Controls.Add(this.wmsBenchesControl);
+            this.wr10TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr10TabPage.Name = "wr10TabPage";
+            this.wr10TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr10TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr10TabPage.TabIndex = 0;
+            this.wr10TabPage.Text = "Water meters";
+            this.wr10TabPage.UseVisualStyleBackColor = true;
+            // 
+            // wmsBenchesControl
+            // 
+            this.wmsBenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wmsBenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.wmsBenchesControl.Name = "wmsBenchesControl";
+            this.wmsBenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.wmsBenchesControl.TabIndex = 0;
+            // 
+            // wr11TabPage
+            // 
+            this.wr11TabPage.Controls.Add(this.i1BenchesControl);
+            this.wr11TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr11TabPage.Name = "wr11TabPage";
+            this.wr11TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr11TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr11TabPage.TabIndex = 1;
+            this.wr11TabPage.Text = "I1";
+            this.wr11TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i1BenchesControl
+            // 
+            this.i1BenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i1BenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i1BenchesControl.Name = "i1BenchesControl";
+            this.i1BenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i1BenchesControl.TabIndex = 0;
+            // 
+            // wr13TabPage
+            // 
+            this.wr13TabPage.Controls.Add(this.i2BbenchesControl);
+            this.wr13TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr13TabPage.Name = "wr13TabPage";
+            this.wr13TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr13TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr13TabPage.TabIndex = 2;
+            this.wr13TabPage.Text = "I2";
+            this.wr13TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i2BbenchesControl
+            // 
+            this.i2BbenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i2BbenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i2BbenchesControl.Name = "i2BbenchesControl";
+            this.i2BbenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i2BbenchesControl.TabIndex = 0;
+            // 
+            // wr14TabPage
+            // 
+            this.wr14TabPage.Controls.Add(this.i3BenchesControl);
+            this.wr14TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr14TabPage.Name = "wr14TabPage";
+            this.wr14TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr14TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr14TabPage.TabIndex = 3;
+            this.wr14TabPage.Text = "I3";
+            this.wr14TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i3BenchesControl
+            // 
+            this.i3BenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i3BenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i3BenchesControl.Name = "i3BenchesControl";
+            this.i3BenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i3BenchesControl.TabIndex = 0;
+            // 
+            // wr15TabPage
+            // 
+            this.wr15TabPage.Controls.Add(this.i4BenchesControl);
+            this.wr15TabPage.Location = new System.Drawing.Point(4, 22);
+            this.wr15TabPage.Name = "wr15TabPage";
+            this.wr15TabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.wr15TabPage.Size = new System.Drawing.Size(1360, 706);
+            this.wr15TabPage.TabIndex = 4;
+            this.wr15TabPage.Text = "I4";
+            this.wr15TabPage.UseVisualStyleBackColor = true;
+            // 
+            // i4BenchesControl
+            // 
+            this.i4BenchesControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.i4BenchesControl.Location = new System.Drawing.Point(3, 3);
+            this.i4BenchesControl.Name = "i4BenchesControl";
+            this.i4BenchesControl.Size = new System.Drawing.Size(1354, 700);
+            this.i4BenchesControl.TabIndex = 0;
+            // 
+            // StatisticsDlg
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1368, 826);
+            this.Controls.Add(this.splitContainer1);
+            this.Name = "StatisticsDlg";
+            this.Text = "Statistics";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.StatisticsDlg_FormClosing);
+            this.Load += new System.EventHandler(this.StatisticsDlg_Load);
+            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.timePeriodGroupBox.ResumeLayout(false);
+            this.timePeriodGroupBox.PerformLayout();
+            this.midsTabControl.ResumeLayout(false);
+            this.wr10TabPage.ResumeLayout(false);
+            this.wr11TabPage.ResumeLayout(false);
+            this.wr13TabPage.ResumeLayout(false);
+            this.wr14TabPage.ResumeLayout(false);
+            this.wr15TabPage.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.TabControl midsTabControl;
+        private System.Windows.Forms.TabPage wr10TabPage;
+        private System.Windows.Forms.TabPage wr11TabPage;
+        private System.Windows.Forms.TabPage wr13TabPage;
+        private System.Windows.Forms.TabPage wr14TabPage;
+        private System.Windows.Forms.TabPage wr15TabPage;
+        private System.Windows.Forms.GroupBox timePeriodGroupBox;
+        private System.Windows.Forms.DateTimePicker dateTimeFromPicker;
+        private System.Windows.Forms.DateTimePicker dateTimeToPicker;
+        private System.Windows.Forms.Label toLabel1;
+        private System.Windows.Forms.Label fromLabel1;
+        private UserControls.MidOrWaterMetersCtrl wmsBenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i1BenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i2BbenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i3BenchesControl;
+        private UserControls.MidOrWaterMetersCtrl i4BenchesControl;
+        private System.Windows.Forms.RadioButton radioButton3;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.RadioButton radioButton4;
+    }
+}
+

Statistics/StatisticsDlg.cs

@@ -0,0 +1,259 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using NHibernate;
+using FluentNHibernate;
+using FluentNHibernate.Cfg;
+using FluentNHibernate.Cfg.Db;
+using Results;
+using Results.Entities;
+using Statistics.Resources;
+using Statistics.UserControls;
+using System.Threading;
+using System.Globalization;
+
+namespace Statistics
+{
+    public partial class StatisticsDlg : Form
+    {
+        static ISessionFactory[] sessionFactories = new ISessionFactory[LocalSettings.BenchesCount];
+
+
+        public StatisticsDlg()
+        {
+            InitializeComponent();
+            
+            ///ManageCheckGroupBox(timePeriodCheckBox, timePeriodGroupBox);
+
+            for (MidId midId = 0; midId < MidId.Count; midId++)
+            {
+                int i = (int)midId;
+                midsTabControl.TabPages[i].Text = midId.ToString();
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).MidId = midId;
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).Parent = this;
+            }
+            midsTabControl.TabPages[0].Text = Strings.Water_meters;
+
+            radioButton1.Checked = true;
+            timePeriodGroupBox.Enabled = false;
+            
+            Localize();
+        }
+
+        void Localize()
+        {
+            Text = Strings.Statistics;
+            //timePeriodCheckBox.Text = Strings.Time_period;
+            fromLabel1.Text = Strings.From;
+            toLabel1.Text = Strings.To;
+            radioButton1.Text = Strings.Last_week;
+            radioButton2.Text = Strings.Last_month;
+            radioButton3.Text = Strings.Last_3_months;
+            radioButton4.Text = Strings.From_to;
+        }
+
+        private void StatisticsDlg_Load(object sender, EventArgs e)
+        {
+            Statistics.LocalSettings ls = Program.LocalSettings;
+            Width = (ls.MainWndWidth > 0) ? ls.MainWndWidth : 1000;
+            Height = (ls.MainWndHeight > 0) ? ls.MainWndHeight : 750;
+            Left = (ls.MainWndLeft != 0) ? ls.MainWndLeft : 50;
+            Top = (ls.MainWndTop != 0) ? ls.MainWndTop : 50;
+
+            switch (ls.SelectedRadioButtonNumber)
+            {
+                case 1: radioButton1.Checked = true; break;
+                case 2: radioButton2.Checked = true; break;
+                case 3: radioButton3.Checked = true; break;
+                case 4: radioButton4.Checked = true; break;
+            }
+
+            for (int i = 0; i < (int)MidId.Count; i++)
+            {
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).Data2UI();
+            }
+
+            for (int i = 0; i < LocalSettings.BenchesCount; i++)
+            {
+                if (!string.IsNullOrEmpty(Program.LocalSettings.GetConnectionString(i)))
+                {
+                    sessionFactories[i] = null;
+                    try
+                    {
+                        sessionFactories[i] = Fluently.Configure()
+                                                      .Database(MySQLConfiguration.Standard.ConnectionString(Program.LocalSettings.GetConnectionString(i)))
+                                                      .Mappings(m => m.FluentMappings.AddFromAssemblyOf<Results.Entities.Batch>())
+                                                      .ExposeConfiguration(BuildSchema)
+                                                      .BuildSessionFactory();
+                    }
+                    catch (Exception)
+                    {
+                        MessageBox.Show(string.Format("Cannot open one of database of {0}", Program.LocalSettings.GetBenchName(i)), "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);                
+                    }
+                }
+            }
+        }
+
+        void BuildSchema(NHibernate.Cfg.Configuration config)
+        {
+            /// This NHibernate tool takes a configuration with mapping info and exports a database schema
+            new NHibernate.Tool.hbm2ddl.SchemaExport(config).SetOutputFile("db_schema");
+        }
+
+        private void ManageCheckGroupBox(CheckBox chk, GroupBox grp)
+        {
+            /// Make sure the CheckBox isn't in the GroupBox. This will only happen the first time.
+            if (chk.Parent == grp)
+            {
+                grp.Parent.Controls.Add(chk);                                       /// Reparent the CheckBox so it's not in the GroupBox.
+                chk.Location = new Point(chk.Left + grp.Left, chk.Top + grp.Top);   /// Adjust the CheckBox's location.
+                chk.BringToFront();                                                 /// Move the CheckBox to the top of the stacking order.
+            }
+
+            /// Enable or disable the GroupBox.
+            grp.Enabled = chk.Checked;
+        }
+
+        //private void timePeriodCheckBox_CheckedChanged(object sender, EventArgs e)
+        //{
+        //    ManageCheckGroupBox(timePeriodCheckBox, timePeriodGroupBox);
+        //}
+
+
+        public IList<TestRslt> UpdateRequest(int benchId, MidId midId)
+        {
+            if ((benchId < 0) || (benchId >= LocalSettings.BenchesCount) || (sessionFactories[benchId] == null) || (midId == MidId.WaterMeters))
+            {
+                if (midId == MidId.WaterMeters)
+                {
+                    MessageBox.Show("Loading statistics of water meters is not implemented yet");
+                }
+                else
+                {
+                    MessageBox.Show(string.Format("Cannot load statistics of {0}", Program.LocalSettings.GetBenchName(benchId)));
+                }
+                return null;
+            }
+
+            Thread thread = new Thread(() => Application.Run(new Forms.ModelessForm()
+            {
+                Title = string.Empty,
+                Message = Strings.searching_,
+                BackgroundColor = Color.LightGreen,
+                FontFamily = "Arial",
+                FontSize = 14,
+                FontStyle = FontStyle.Regular,
+            }));
+            thread.CurrentCulture = CultureInfo.CurrentCulture;
+            thread.CurrentUICulture = CultureInfo.CurrentUICulture;
+            thread.Start();
+
+            DateTime from;
+            DateTime to;
+            GetDateRange(out from, out to);
+
+            try
+            {
+                ISession session = sessionFactories[benchId].OpenSession();
+                var listOfComponentsWithFlowmeter = session.QueryOver<Components>()
+                                                           .Where(x => (x.Flowmeter == midId.ToString()))
+                                                           .List();
+                IList<TestRslt> testRslts = new List<TestRslt>();
+                foreach (var cmpnts in listOfComponentsWithFlowmeter)
+                {
+                    var listOfRslts = session.QueryOver<TestRslt>()
+                                             .Where(x => ((x.EndTime >= from) && (x.EndTime <= to)))
+                                             .And(x => (x.Components == cmpnts))
+                                             .List();
+                    foreach (var tr in listOfRslts) testRslts.Add(tr);
+                }
+
+                Forms.ModelessForm.CloseForm();
+                session.Close();
+                return testRslts;
+            }
+            catch (Exception exc)
+            {
+                Forms.ModelessForm.CloseForm();
+                MessageBox.Show(string.Format("Error loading statistics of {0}\r\n{1}", Program.LocalSettings.GetBenchName(benchId), exc.Message));
+                return null;
+            }
+        }
+
+        void GetDateRange(out DateTime from, out DateTime to)
+        {
+            if (radioButton1.Checked)
+            {
+                /// Last week
+                from = DateTime.Now.Date.AddDays(-7);
+                to = DateTime.Now;
+            }
+            else if (radioButton2.Checked)
+            {
+                /// Last month
+                from = DateTime.Now.Date.AddDays(-31);
+                to = DateTime.Now;
+            }
+            else if (radioButton3.Checked)
+            {
+                /// Last 3 months
+                from = DateTime.Now.Date.AddDays(-91);
+                to = DateTime.Now;
+            }
+            else
+            {
+                /// From / to
+                from = dateTimeFromPicker.Value.Date;
+                to = dateTimeToPicker.Value.Date.AddDays(1).AddTicks(-1);
+            }
+        }
+
+        private void radioButton4_CheckedChanged(object sender, EventArgs e)
+        {
+            timePeriodGroupBox.Enabled = radioButton4.Checked;
+        }
+
+        private void StatisticsDlg_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            LocalSettings ls = Program.LocalSettings;
+
+            ls.ManiWndMaximized = (WindowState == FormWindowState.Maximized);
+            if (WindowState == FormWindowState.Normal)
+            {
+                ls.MainWndLeft = Location.X;
+                ls.MainWndTop = Location.Y;
+                ls.MainWndWidth = Size.Width;
+                ls.MainWndHeight = Size.Height;
+            }
+            else
+            {
+                /// Maximized or minimized (when restarted, minimized window is restored as normal)
+                ls.MainWndLeft = RestoreBounds.Left;
+                ls.MainWndTop = RestoreBounds.Top;
+                ls.MainWndWidth = RestoreBounds.Width;
+                ls.MainWndHeight = RestoreBounds.Height;
+            }
+            
+            if (radioButton1.Checked) ls.SelectedRadioButtonNumber = 1;
+            else if (radioButton2.Checked) ls.SelectedRadioButtonNumber = 2;
+            else if (radioButton3.Checked) ls.SelectedRadioButtonNumber = 3;
+            else if (radioButton4.Checked) ls.SelectedRadioButtonNumber = 4;
+            else ls.SelectedRadioButtonNumber = 0;
+
+            for (int i = 0; i < (int)MidId.Count; i++)
+            {
+                (midsTabControl.TabPages[i].Controls[0] as MidOrWaterMetersCtrl).UI2Data();
+            }
+
+            ls.Save();
+        }
+    }
+}

Statistics/StatisticsDlg.resx

@@ -0,0 +1,120 @@
+<?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>

Statistics/UserControls/Enums.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Statistics.UserControls
+{
+    public enum MidId
+    {
+        ///  When converted to 'int' it's the MID number, 0 = water meters
+        WaterMeters,
+        I1,
+        I2,
+        I3,
+        I4,
+        Count
+    }
+}

Statistics/UserControls/MidOrWaterMetersCtrl.Designer.cs

@@ -0,0 +1,871 @@
+namespace Statistics.UserControls
+{
+    partial class MidOrWaterMetersCtrl
+    {
+        /// <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.flow3GroupBox = new System.Windows.Forms.GroupBox();
+            this.flow3ToExclamation = new System.Windows.Forms.Label();
+            this.flow3FromExclamation = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.toLabel4 = new System.Windows.Forms.Label();
+            this.fromLabel4 = new System.Windows.Forms.Label();
+            this.flow3ToTextBox = new System.Windows.Forms.TextBox();
+            this.flow3FromTextBox = new System.Windows.Forms.TextBox();
+            this.flow3CheckBox = new System.Windows.Forms.CheckBox();
+            this.flow2GroupBox = new System.Windows.Forms.GroupBox();
+            this.flow2ToExclamation = new System.Windows.Forms.Label();
+            this.flow2FromExclamation = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.toLabel3 = new System.Windows.Forms.Label();
+            this.fromLabel3 = new System.Windows.Forms.Label();
+            this.flow2ToTextBox = new System.Windows.Forms.TextBox();
+            this.flow2FromTextBox = new System.Windows.Forms.TextBox();
+            this.flow2CheckBox = new System.Windows.Forms.CheckBox();
+            this.flow1GroupBox = new System.Windows.Forms.GroupBox();
+            this.flow1ToExclamation = new System.Windows.Forms.Label();
+            this.flow1FromExclamation = new System.Windows.Forms.Label();
+            this.m3hLabel2 = new System.Windows.Forms.Label();
+            this.m3hLabel1 = new System.Windows.Forms.Label();
+            this.toLabel2 = new System.Windows.Forms.Label();
+            this.fromLabel2 = new System.Windows.Forms.Label();
+            this.flow1ToTextBox = new System.Windows.Forms.TextBox();
+            this.flow1FromTextBox = new System.Windows.Forms.TextBox();
+            this.flow1CheckBox = new System.Windows.Forms.CheckBox();
+            this.benchesTabControl = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.tabPage4 = new System.Windows.Forms.TabPage();
+            this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.tabPage6 = new System.Windows.Forms.TabPage();
+            this.flow4GroupBox = new System.Windows.Forms.GroupBox();
+            this.flow4ToExclamation = new System.Windows.Forms.Label();
+            this.flow4FromExclamation = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.toLabel5 = new System.Windows.Forms.Label();
+            this.fromLabel5 = new System.Windows.Forms.Label();
+            this.flow4ToTextBox = new System.Windows.Forms.TextBox();
+            this.flow4FromTextBox = new System.Windows.Forms.TextBox();
+            this.flow4CheckBox = new System.Windows.Forms.CheckBox();
+            this.flow5GroupBox = new System.Windows.Forms.GroupBox();
+            this.flow5ToExclamation = new System.Windows.Forms.Label();
+            this.flow5FromExclamation = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
+            this.toLabel6 = new System.Windows.Forms.Label();
+            this.fromLabel6 = new System.Windows.Forms.Label();
+            this.flow5ToTextBox = new System.Windows.Forms.TextBox();
+            this.flow5FromTextBox = new System.Windows.Forms.TextBox();
+            this.flow5CheckBox = new System.Windows.Forms.CheckBox();
+            this.wr10StatisticsCtrl1 = new Statistics.UserControls.StatisticsCtrl();
+            this.wr11StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
+            this.wr13StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
+            this.wr14StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
+            this.wr15StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
+            this.pt7StatisticsCtrl = new Statistics.UserControls.StatisticsCtrl();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.flow3GroupBox.SuspendLayout();
+            this.flow2GroupBox.SuspendLayout();
+            this.flow1GroupBox.SuspendLayout();
+            this.benchesTabControl.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
+            this.tabPage3.SuspendLayout();
+            this.tabPage4.SuspendLayout();
+            this.tabPage5.SuspendLayout();
+            this.tabPage6.SuspendLayout();
+            this.flow4GroupBox.SuspendLayout();
+            this.flow5GroupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.IsSplitterFixed = true;
+            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.flow5GroupBox);
+            this.splitContainer1.Panel1.Controls.Add(this.flow4GroupBox);
+            this.splitContainer1.Panel1.Controls.Add(this.flow3GroupBox);
+            this.splitContainer1.Panel1.Controls.Add(this.flow2GroupBox);
+            this.splitContainer1.Panel1.Controls.Add(this.flow1GroupBox);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.benchesTabControl);
+            this.splitContainer1.Size = new System.Drawing.Size(1202, 450);
+            this.splitContainer1.SplitterDistance = 90;
+            this.splitContainer1.TabIndex = 0;
+            // 
+            // flow3GroupBox
+            // 
+            this.flow3GroupBox.Controls.Add(this.flow3ToExclamation);
+            this.flow3GroupBox.Controls.Add(this.flow3FromExclamation);
+            this.flow3GroupBox.Controls.Add(this.label3);
+            this.flow3GroupBox.Controls.Add(this.label4);
+            this.flow3GroupBox.Controls.Add(this.toLabel4);
+            this.flow3GroupBox.Controls.Add(this.fromLabel4);
+            this.flow3GroupBox.Controls.Add(this.flow3ToTextBox);
+            this.flow3GroupBox.Controls.Add(this.flow3FromTextBox);
+            this.flow3GroupBox.Controls.Add(this.flow3CheckBox);
+            this.flow3GroupBox.Location = new System.Drawing.Point(473, 7);
+            this.flow3GroupBox.Name = "flow3GroupBox";
+            this.flow3GroupBox.Size = new System.Drawing.Size(221, 77);
+            this.flow3GroupBox.TabIndex = 6;
+            this.flow3GroupBox.TabStop = false;
+            // 
+            // flow3ToExclamation
+            // 
+            this.flow3ToExclamation.AutoSize = true;
+            this.flow3ToExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow3ToExclamation.Location = new System.Drawing.Point(167, 48);
+            this.flow3ToExclamation.Name = "flow3ToExclamation";
+            this.flow3ToExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow3ToExclamation.TabIndex = 9;
+            this.flow3ToExclamation.Text = "!";
+            this.flow3ToExclamation.Visible = false;
+            // 
+            // flow3FromExclamation
+            // 
+            this.flow3FromExclamation.AutoSize = true;
+            this.flow3FromExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow3FromExclamation.Location = new System.Drawing.Point(167, 24);
+            this.flow3FromExclamation.Name = "flow3FromExclamation";
+            this.flow3FromExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow3FromExclamation.TabIndex = 8;
+            this.flow3FromExclamation.Text = "!";
+            this.flow3FromExclamation.Visible = false;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(178, 48);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(32, 13);
+            this.label3.TabIndex = 6;
+            this.label3.Text = "m3/h";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(177, 23);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(32, 13);
+            this.label4.TabIndex = 5;
+            this.label4.Text = "m3/h";
+            // 
+            // toLabel4
+            // 
+            this.toLabel4.AutoSize = true;
+            this.toLabel4.Location = new System.Drawing.Point(14, 48);
+            this.toLabel4.Name = "toLabel4";
+            this.toLabel4.Size = new System.Drawing.Size(20, 13);
+            this.toLabel4.TabIndex = 4;
+            this.toLabel4.Text = "To";
+            // 
+            // fromLabel4
+            // 
+            this.fromLabel4.AutoSize = true;
+            this.fromLabel4.Location = new System.Drawing.Point(14, 23);
+            this.fromLabel4.Name = "fromLabel4";
+            this.fromLabel4.Size = new System.Drawing.Size(30, 13);
+            this.fromLabel4.TabIndex = 3;
+            this.fromLabel4.Text = "From";
+            // 
+            // flow3ToTextBox
+            // 
+            this.flow3ToTextBox.Location = new System.Drawing.Point(65, 45);
+            this.flow3ToTextBox.Name = "flow3ToTextBox";
+            this.flow3ToTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow3ToTextBox.TabIndex = 2;
+            this.flow3ToTextBox.TextChanged += new System.EventHandler(this.flow3ToTextBox_TextChanged);
+            // 
+            // flow3FromTextBox
+            // 
+            this.flow3FromTextBox.Location = new System.Drawing.Point(65, 20);
+            this.flow3FromTextBox.Name = "flow3FromTextBox";
+            this.flow3FromTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow3FromTextBox.TabIndex = 1;
+            this.flow3FromTextBox.TextChanged += new System.EventHandler(this.flow3FromTextBox_TextChanged);
+            // 
+            // flow3CheckBox
+            // 
+            this.flow3CheckBox.AutoSize = true;
+            this.flow3CheckBox.Location = new System.Drawing.Point(10, 0);
+            this.flow3CheckBox.Name = "flow3CheckBox";
+            this.flow3CheckBox.Size = new System.Drawing.Size(57, 17);
+            this.flow3CheckBox.TabIndex = 0;
+            this.flow3CheckBox.Text = "Flow 3";
+            this.flow3CheckBox.UseVisualStyleBackColor = true;
+            this.flow3CheckBox.CheckedChanged += new System.EventHandler(this.flow3CheckBox_CheckedChanged);
+            // 
+            // flow2GroupBox
+            // 
+            this.flow2GroupBox.Controls.Add(this.flow2ToExclamation);
+            this.flow2GroupBox.Controls.Add(this.flow2FromExclamation);
+            this.flow2GroupBox.Controls.Add(this.label1);
+            this.flow2GroupBox.Controls.Add(this.label2);
+            this.flow2GroupBox.Controls.Add(this.toLabel3);
+            this.flow2GroupBox.Controls.Add(this.fromLabel3);
+            this.flow2GroupBox.Controls.Add(this.flow2ToTextBox);
+            this.flow2GroupBox.Controls.Add(this.flow2FromTextBox);
+            this.flow2GroupBox.Controls.Add(this.flow2CheckBox);
+            this.flow2GroupBox.Location = new System.Drawing.Point(240, 7);
+            this.flow2GroupBox.Name = "flow2GroupBox";
+            this.flow2GroupBox.Size = new System.Drawing.Size(221, 77);
+            this.flow2GroupBox.TabIndex = 5;
+            this.flow2GroupBox.TabStop = false;
+            // 
+            // flow2ToExclamation
+            // 
+            this.flow2ToExclamation.AutoSize = true;
+            this.flow2ToExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow2ToExclamation.Location = new System.Drawing.Point(167, 49);
+            this.flow2ToExclamation.Name = "flow2ToExclamation";
+            this.flow2ToExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow2ToExclamation.TabIndex = 9;
+            this.flow2ToExclamation.Text = "!";
+            this.flow2ToExclamation.Visible = false;
+            // 
+            // flow2FromExclamation
+            // 
+            this.flow2FromExclamation.AutoSize = true;
+            this.flow2FromExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow2FromExclamation.Location = new System.Drawing.Point(167, 24);
+            this.flow2FromExclamation.Name = "flow2FromExclamation";
+            this.flow2FromExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow2FromExclamation.TabIndex = 8;
+            this.flow2FromExclamation.Text = "!";
+            this.flow2FromExclamation.Visible = false;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(178, 48);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(32, 13);
+            this.label1.TabIndex = 6;
+            this.label1.Text = "m3/h";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(177, 23);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(32, 13);
+            this.label2.TabIndex = 5;
+            this.label2.Text = "m3/h";
+            // 
+            // toLabel3
+            // 
+            this.toLabel3.AutoSize = true;
+            this.toLabel3.Location = new System.Drawing.Point(14, 48);
+            this.toLabel3.Name = "toLabel3";
+            this.toLabel3.Size = new System.Drawing.Size(20, 13);
+            this.toLabel3.TabIndex = 4;
+            this.toLabel3.Text = "To";
+            // 
+            // fromLabel3
+            // 
+            this.fromLabel3.AutoSize = true;
+            this.fromLabel3.Location = new System.Drawing.Point(14, 23);
+            this.fromLabel3.Name = "fromLabel3";
+            this.fromLabel3.Size = new System.Drawing.Size(30, 13);
+            this.fromLabel3.TabIndex = 3;
+            this.fromLabel3.Text = "From";
+            // 
+            // flow2ToTextBox
+            // 
+            this.flow2ToTextBox.Location = new System.Drawing.Point(65, 45);
+            this.flow2ToTextBox.Name = "flow2ToTextBox";
+            this.flow2ToTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow2ToTextBox.TabIndex = 2;
+            this.flow2ToTextBox.TextChanged += new System.EventHandler(this.flow2ToTextBox_TextChanged);
+            // 
+            // flow2FromTextBox
+            // 
+            this.flow2FromTextBox.Location = new System.Drawing.Point(65, 20);
+            this.flow2FromTextBox.Name = "flow2FromTextBox";
+            this.flow2FromTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow2FromTextBox.TabIndex = 1;
+            this.flow2FromTextBox.TextChanged += new System.EventHandler(this.flow2FromTextBox_TextChanged);
+            // 
+            // flow2CheckBox
+            // 
+            this.flow2CheckBox.AutoSize = true;
+            this.flow2CheckBox.Location = new System.Drawing.Point(6, 0);
+            this.flow2CheckBox.Name = "flow2CheckBox";
+            this.flow2CheckBox.Size = new System.Drawing.Size(57, 17);
+            this.flow2CheckBox.TabIndex = 0;
+            this.flow2CheckBox.Text = "Flow 2";
+            this.flow2CheckBox.UseVisualStyleBackColor = true;
+            this.flow2CheckBox.CheckedChanged += new System.EventHandler(this.flow2CheckBox_CheckedChanged);
+            // 
+            // flow1GroupBox
+            // 
+            this.flow1GroupBox.Controls.Add(this.flow1ToExclamation);
+            this.flow1GroupBox.Controls.Add(this.flow1FromExclamation);
+            this.flow1GroupBox.Controls.Add(this.m3hLabel2);
+            this.flow1GroupBox.Controls.Add(this.m3hLabel1);
+            this.flow1GroupBox.Controls.Add(this.toLabel2);
+            this.flow1GroupBox.Controls.Add(this.fromLabel2);
+            this.flow1GroupBox.Controls.Add(this.flow1ToTextBox);
+            this.flow1GroupBox.Controls.Add(this.flow1FromTextBox);
+            this.flow1GroupBox.Controls.Add(this.flow1CheckBox);
+            this.flow1GroupBox.Location = new System.Drawing.Point(7, 7);
+            this.flow1GroupBox.Name = "flow1GroupBox";
+            this.flow1GroupBox.Size = new System.Drawing.Size(221, 77);
+            this.flow1GroupBox.TabIndex = 4;
+            this.flow1GroupBox.TabStop = false;
+            // 
+            // flow1ToExclamation
+            // 
+            this.flow1ToExclamation.AutoSize = true;
+            this.flow1ToExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow1ToExclamation.Location = new System.Drawing.Point(167, 49);
+            this.flow1ToExclamation.Name = "flow1ToExclamation";
+            this.flow1ToExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow1ToExclamation.TabIndex = 8;
+            this.flow1ToExclamation.Text = "!";
+            this.flow1ToExclamation.Visible = false;
+            // 
+            // flow1FromExclamation
+            // 
+            this.flow1FromExclamation.AutoSize = true;
+            this.flow1FromExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow1FromExclamation.Location = new System.Drawing.Point(167, 24);
+            this.flow1FromExclamation.Name = "flow1FromExclamation";
+            this.flow1FromExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow1FromExclamation.TabIndex = 7;
+            this.flow1FromExclamation.Text = "!";
+            this.flow1FromExclamation.Visible = false;
+            // 
+            // m3hLabel2
+            // 
+            this.m3hLabel2.AutoSize = true;
+            this.m3hLabel2.Location = new System.Drawing.Point(178, 48);
+            this.m3hLabel2.Name = "m3hLabel2";
+            this.m3hLabel2.Size = new System.Drawing.Size(32, 13);
+            this.m3hLabel2.TabIndex = 6;
+            this.m3hLabel2.Text = "m3/h";
+            // 
+            // m3hLabel1
+            // 
+            this.m3hLabel1.AutoSize = true;
+            this.m3hLabel1.Location = new System.Drawing.Point(177, 23);
+            this.m3hLabel1.Name = "m3hLabel1";
+            this.m3hLabel1.Size = new System.Drawing.Size(32, 13);
+            this.m3hLabel1.TabIndex = 5;
+            this.m3hLabel1.Text = "m3/h";
+            // 
+            // toLabel2
+            // 
+            this.toLabel2.AutoSize = true;
+            this.toLabel2.Location = new System.Drawing.Point(14, 48);
+            this.toLabel2.Name = "toLabel2";
+            this.toLabel2.Size = new System.Drawing.Size(20, 13);
+            this.toLabel2.TabIndex = 4;
+            this.toLabel2.Text = "To";
+            // 
+            // fromLabel2
+            // 
+            this.fromLabel2.AutoSize = true;
+            this.fromLabel2.Location = new System.Drawing.Point(14, 23);
+            this.fromLabel2.Name = "fromLabel2";
+            this.fromLabel2.Size = new System.Drawing.Size(30, 13);
+            this.fromLabel2.TabIndex = 3;
+            this.fromLabel2.Text = "From";
+            // 
+            // flow1ToTextBox
+            // 
+            this.flow1ToTextBox.Location = new System.Drawing.Point(65, 45);
+            this.flow1ToTextBox.Name = "flow1ToTextBox";
+            this.flow1ToTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow1ToTextBox.TabIndex = 2;
+            this.flow1ToTextBox.TextChanged += new System.EventHandler(this.flow1ToTextBox_TextChanged);
+            // 
+            // flow1FromTextBox
+            // 
+            this.flow1FromTextBox.Location = new System.Drawing.Point(65, 20);
+            this.flow1FromTextBox.Name = "flow1FromTextBox";
+            this.flow1FromTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow1FromTextBox.TabIndex = 1;
+            this.flow1FromTextBox.TextChanged += new System.EventHandler(this.flow1FromTextBox_TextChanged);
+            // 
+            // flow1CheckBox
+            // 
+            this.flow1CheckBox.AutoSize = true;
+            this.flow1CheckBox.Location = new System.Drawing.Point(6, 0);
+            this.flow1CheckBox.Name = "flow1CheckBox";
+            this.flow1CheckBox.Size = new System.Drawing.Size(57, 17);
+            this.flow1CheckBox.TabIndex = 0;
+            this.flow1CheckBox.Text = "Flow 1";
+            this.flow1CheckBox.UseVisualStyleBackColor = true;
+            this.flow1CheckBox.CheckedChanged += new System.EventHandler(this.flow1CheckBox_CheckedChanged);
+            // 
+            // benchesTabControl
+            // 
+            this.benchesTabControl.Controls.Add(this.tabPage1);
+            this.benchesTabControl.Controls.Add(this.tabPage2);
+            this.benchesTabControl.Controls.Add(this.tabPage3);
+            this.benchesTabControl.Controls.Add(this.tabPage4);
+            this.benchesTabControl.Controls.Add(this.tabPage5);
+            this.benchesTabControl.Controls.Add(this.tabPage6);
+            this.benchesTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.benchesTabControl.Location = new System.Drawing.Point(0, 0);
+            this.benchesTabControl.Name = "benchesTabControl";
+            this.benchesTabControl.SelectedIndex = 0;
+            this.benchesTabControl.Size = new System.Drawing.Size(1202, 356);
+            this.benchesTabControl.TabIndex = 0;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.wr10StatisticsCtrl1);
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "WR10";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.wr11StatisticsCtrl);
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "WR11";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.wr13StatisticsCtrl);
+            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "WR13";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // tabPage4
+            // 
+            this.tabPage4.Controls.Add(this.wr14StatisticsCtrl);
+            this.tabPage4.Location = new System.Drawing.Point(4, 22);
+            this.tabPage4.Name = "tabPage4";
+            this.tabPage4.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage4.TabIndex = 3;
+            this.tabPage4.Text = "WR14";
+            this.tabPage4.UseVisualStyleBackColor = true;
+            // 
+            // tabPage5
+            // 
+            this.tabPage5.Controls.Add(this.wr15StatisticsCtrl);
+            this.tabPage5.Location = new System.Drawing.Point(4, 22);
+            this.tabPage5.Name = "tabPage5";
+            this.tabPage5.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage5.TabIndex = 4;
+            this.tabPage5.Text = "WR15";
+            this.tabPage5.UseVisualStyleBackColor = true;
+            // 
+            // tabPage6
+            // 
+            this.tabPage6.Controls.Add(this.pt7StatisticsCtrl);
+            this.tabPage6.Location = new System.Drawing.Point(4, 22);
+            this.tabPage6.Name = "tabPage6";
+            this.tabPage6.Size = new System.Drawing.Size(1194, 330);
+            this.tabPage6.TabIndex = 5;
+            this.tabPage6.Text = "PT7";
+            this.tabPage6.UseVisualStyleBackColor = true;
+            // 
+            // flow4GroupBox
+            // 
+            this.flow4GroupBox.Controls.Add(this.flow4ToExclamation);
+            this.flow4GroupBox.Controls.Add(this.flow4FromExclamation);
+            this.flow4GroupBox.Controls.Add(this.label7);
+            this.flow4GroupBox.Controls.Add(this.label8);
+            this.flow4GroupBox.Controls.Add(this.toLabel5);
+            this.flow4GroupBox.Controls.Add(this.fromLabel5);
+            this.flow4GroupBox.Controls.Add(this.flow4ToTextBox);
+            this.flow4GroupBox.Controls.Add(this.flow4FromTextBox);
+            this.flow4GroupBox.Controls.Add(this.flow4CheckBox);
+            this.flow4GroupBox.Location = new System.Drawing.Point(706, 7);
+            this.flow4GroupBox.Name = "flow4GroupBox";
+            this.flow4GroupBox.Size = new System.Drawing.Size(221, 77);
+            this.flow4GroupBox.TabIndex = 7;
+            this.flow4GroupBox.TabStop = false;
+            // 
+            // flow4ToExclamation
+            // 
+            this.flow4ToExclamation.AutoSize = true;
+            this.flow4ToExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow4ToExclamation.Location = new System.Drawing.Point(167, 48);
+            this.flow4ToExclamation.Name = "flow4ToExclamation";
+            this.flow4ToExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow4ToExclamation.TabIndex = 9;
+            this.flow4ToExclamation.Text = "!";
+            this.flow4ToExclamation.Visible = false;
+            // 
+            // flow4FromExclamation
+            // 
+            this.flow4FromExclamation.AutoSize = true;
+            this.flow4FromExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow4FromExclamation.Location = new System.Drawing.Point(167, 24);
+            this.flow4FromExclamation.Name = "flow4FromExclamation";
+            this.flow4FromExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow4FromExclamation.TabIndex = 8;
+            this.flow4FromExclamation.Text = "!";
+            this.flow4FromExclamation.Visible = false;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(178, 48);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(32, 13);
+            this.label7.TabIndex = 6;
+            this.label7.Text = "m3/h";
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(177, 23);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(32, 13);
+            this.label8.TabIndex = 5;
+            this.label8.Text = "m3/h";
+            // 
+            // toLabel5
+            // 
+            this.toLabel5.AutoSize = true;
+            this.toLabel5.Location = new System.Drawing.Point(14, 48);
+            this.toLabel5.Name = "toLabel5";
+            this.toLabel5.Size = new System.Drawing.Size(20, 13);
+            this.toLabel5.TabIndex = 4;
+            this.toLabel5.Text = "To";
+            // 
+            // fromLabel5
+            // 
+            this.fromLabel5.AutoSize = true;
+            this.fromLabel5.Location = new System.Drawing.Point(14, 23);
+            this.fromLabel5.Name = "fromLabel5";
+            this.fromLabel5.Size = new System.Drawing.Size(30, 13);
+            this.fromLabel5.TabIndex = 3;
+            this.fromLabel5.Text = "From";
+            // 
+            // flow4ToTextBox
+            // 
+            this.flow4ToTextBox.Location = new System.Drawing.Point(65, 45);
+            this.flow4ToTextBox.Name = "flow4ToTextBox";
+            this.flow4ToTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow4ToTextBox.TabIndex = 2;
+            this.flow4ToTextBox.TextChanged += new System.EventHandler(this.flow4ToTextBox_TextChanged);
+            // 
+            // flow4FromTextBox
+            // 
+            this.flow4FromTextBox.Location = new System.Drawing.Point(65, 20);
+            this.flow4FromTextBox.Name = "flow4FromTextBox";
+            this.flow4FromTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow4FromTextBox.TabIndex = 1;
+            this.flow4FromTextBox.TextChanged += new System.EventHandler(this.flow4FromTextBox_TextChanged);
+            // 
+            // flow4CheckBox
+            // 
+            this.flow4CheckBox.AutoSize = true;
+            this.flow4CheckBox.Location = new System.Drawing.Point(10, 0);
+            this.flow4CheckBox.Name = "flow4CheckBox";
+            this.flow4CheckBox.Size = new System.Drawing.Size(57, 17);
+            this.flow4CheckBox.TabIndex = 0;
+            this.flow4CheckBox.Text = "Flow 4";
+            this.flow4CheckBox.UseVisualStyleBackColor = true;
+            this.flow4CheckBox.CheckedChanged += new System.EventHandler(this.flow4CheckBox_CheckedChanged);
+            // 
+            // flow5GroupBox
+            // 
+            this.flow5GroupBox.Controls.Add(this.flow5ToExclamation);
+            this.flow5GroupBox.Controls.Add(this.flow5FromExclamation);
+            this.flow5GroupBox.Controls.Add(this.label9);
+            this.flow5GroupBox.Controls.Add(this.label10);
+            this.flow5GroupBox.Controls.Add(this.toLabel6);
+            this.flow5GroupBox.Controls.Add(this.fromLabel6);
+            this.flow5GroupBox.Controls.Add(this.flow5ToTextBox);
+            this.flow5GroupBox.Controls.Add(this.flow5FromTextBox);
+            this.flow5GroupBox.Controls.Add(this.flow5CheckBox);
+            this.flow5GroupBox.Location = new System.Drawing.Point(939, 7);
+            this.flow5GroupBox.Name = "flow5GroupBox";
+            this.flow5GroupBox.Size = new System.Drawing.Size(221, 77);
+            this.flow5GroupBox.TabIndex = 8;
+            this.flow5GroupBox.TabStop = false;
+            // 
+            // flow5ToExclamation
+            // 
+            this.flow5ToExclamation.AutoSize = true;
+            this.flow5ToExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow5ToExclamation.Location = new System.Drawing.Point(167, 48);
+            this.flow5ToExclamation.Name = "flow5ToExclamation";
+            this.flow5ToExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow5ToExclamation.TabIndex = 9;
+            this.flow5ToExclamation.Text = "!";
+            this.flow5ToExclamation.Visible = false;
+            // 
+            // flow5FromExclamation
+            // 
+            this.flow5FromExclamation.AutoSize = true;
+            this.flow5FromExclamation.ForeColor = System.Drawing.Color.Red;
+            this.flow5FromExclamation.Location = new System.Drawing.Point(167, 24);
+            this.flow5FromExclamation.Name = "flow5FromExclamation";
+            this.flow5FromExclamation.Size = new System.Drawing.Size(10, 13);
+            this.flow5FromExclamation.TabIndex = 8;
+            this.flow5FromExclamation.Text = "!";
+            this.flow5FromExclamation.Visible = false;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(178, 48);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(32, 13);
+            this.label9.TabIndex = 6;
+            this.label9.Text = "m3/h";
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(177, 23);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(32, 13);
+            this.label10.TabIndex = 5;
+            this.label10.Text = "m3/h";
+            // 
+            // toLabel6
+            // 
+            this.toLabel6.AutoSize = true;
+            this.toLabel6.Location = new System.Drawing.Point(14, 48);
+            this.toLabel6.Name = "toLabel6";
+            this.toLabel6.Size = new System.Drawing.Size(20, 13);
+            this.toLabel6.TabIndex = 4;
+            this.toLabel6.Text = "To";
+            // 
+            // fromLabel6
+            // 
+            this.fromLabel6.AutoSize = true;
+            this.fromLabel6.Location = new System.Drawing.Point(14, 23);
+            this.fromLabel6.Name = "fromLabel6";
+            this.fromLabel6.Size = new System.Drawing.Size(30, 13);
+            this.fromLabel6.TabIndex = 3;
+            this.fromLabel6.Text = "From";
+            // 
+            // flow5ToTextBox
+            // 
+            this.flow5ToTextBox.Location = new System.Drawing.Point(65, 45);
+            this.flow5ToTextBox.Name = "flow5ToTextBox";
+            this.flow5ToTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow5ToTextBox.TabIndex = 2;
+            this.flow5ToTextBox.TextChanged += new System.EventHandler(this.flow5ToTextBox_TextChanged);
+            // 
+            // flow5FromTextBox
+            // 
+            this.flow5FromTextBox.Location = new System.Drawing.Point(65, 20);
+            this.flow5FromTextBox.Name = "flow5FromTextBox";
+            this.flow5FromTextBox.Size = new System.Drawing.Size(100, 20);
+            this.flow5FromTextBox.TabIndex = 1;
+            this.flow5FromTextBox.TextChanged += new System.EventHandler(this.flow5FromTextBox_TextChanged);
+            // 
+            // flow5CheckBox
+            // 
+            this.flow5CheckBox.AutoSize = true;
+            this.flow5CheckBox.Location = new System.Drawing.Point(10, 0);
+            this.flow5CheckBox.Name = "flow5CheckBox";
+            this.flow5CheckBox.Size = new System.Drawing.Size(57, 17);
+            this.flow5CheckBox.TabIndex = 0;
+            this.flow5CheckBox.Text = "Flow 5";
+            this.flow5CheckBox.UseVisualStyleBackColor = true;
+            this.flow5CheckBox.CheckedChanged += new System.EventHandler(this.flow5CheckBox_CheckedChanged);
+            // 
+            // wr10StatisticsCtrl1
+            // 
+            this.wr10StatisticsCtrl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr10StatisticsCtrl1.Location = new System.Drawing.Point(3, 3);
+            this.wr10StatisticsCtrl1.Name = "wr10StatisticsCtrl1";
+            this.wr10StatisticsCtrl1.Size = new System.Drawing.Size(1188, 324);
+            this.wr10StatisticsCtrl1.TabIndex = 0;
+            // 
+            // wr11StatisticsCtrl
+            // 
+            this.wr11StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr11StatisticsCtrl.Location = new System.Drawing.Point(3, 3);
+            this.wr11StatisticsCtrl.Name = "wr11StatisticsCtrl";
+            this.wr11StatisticsCtrl.Size = new System.Drawing.Size(1188, 324);
+            this.wr11StatisticsCtrl.TabIndex = 0;
+            // 
+            // wr13StatisticsCtrl
+            // 
+            this.wr13StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr13StatisticsCtrl.Location = new System.Drawing.Point(0, 0);
+            this.wr13StatisticsCtrl.Name = "wr13StatisticsCtrl";
+            this.wr13StatisticsCtrl.Size = new System.Drawing.Size(1194, 330);
+            this.wr13StatisticsCtrl.TabIndex = 0;
+            // 
+            // wr14StatisticsCtrl
+            // 
+            this.wr14StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr14StatisticsCtrl.Location = new System.Drawing.Point(0, 0);
+            this.wr14StatisticsCtrl.Name = "wr14StatisticsCtrl";
+            this.wr14StatisticsCtrl.Size = new System.Drawing.Size(1194, 330);
+            this.wr14StatisticsCtrl.TabIndex = 0;
+            // 
+            // wr15StatisticsCtrl
+            // 
+            this.wr15StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wr15StatisticsCtrl.Location = new System.Drawing.Point(0, 0);
+            this.wr15StatisticsCtrl.Name = "wr15StatisticsCtrl";
+            this.wr15StatisticsCtrl.Size = new System.Drawing.Size(1194, 330);
+            this.wr15StatisticsCtrl.TabIndex = 0;
+            // 
+            // pt7StatisticsCtrl
+            // 
+            this.pt7StatisticsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pt7StatisticsCtrl.Location = new System.Drawing.Point(0, 0);
+            this.pt7StatisticsCtrl.Name = "pt7StatisticsCtrl";
+            this.pt7StatisticsCtrl.Size = new System.Drawing.Size(1194, 330);
+            this.pt7StatisticsCtrl.TabIndex = 0;
+            // 
+            // MidOrWaterMetersCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.splitContainer1);
+            this.Name = "MidOrWaterMetersCtrl";
+            this.Size = new System.Drawing.Size(1202, 450);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.flow3GroupBox.ResumeLayout(false);
+            this.flow3GroupBox.PerformLayout();
+            this.flow2GroupBox.ResumeLayout(false);
+            this.flow2GroupBox.PerformLayout();
+            this.flow1GroupBox.ResumeLayout(false);
+            this.flow1GroupBox.PerformLayout();
+            this.benchesTabControl.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
+            this.tabPage3.ResumeLayout(false);
+            this.tabPage4.ResumeLayout(false);
+            this.tabPage5.ResumeLayout(false);
+            this.tabPage6.ResumeLayout(false);
+            this.flow4GroupBox.ResumeLayout(false);
+            this.flow4GroupBox.PerformLayout();
+            this.flow5GroupBox.ResumeLayout(false);
+            this.flow5GroupBox.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.TabControl benchesTabControl;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.TabPage tabPage4;
+        private System.Windows.Forms.TabPage tabPage5;
+        private System.Windows.Forms.TabPage tabPage6;
+        private StatisticsCtrl wr10StatisticsCtrl1;
+        private StatisticsCtrl wr11StatisticsCtrl;
+        private StatisticsCtrl wr13StatisticsCtrl;
+        private StatisticsCtrl wr14StatisticsCtrl;
+        private StatisticsCtrl wr15StatisticsCtrl;
+        private StatisticsCtrl pt7StatisticsCtrl;
+        private System.Windows.Forms.GroupBox flow3GroupBox;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label toLabel4;
+        private System.Windows.Forms.Label fromLabel4;
+        private System.Windows.Forms.TextBox flow3ToTextBox;
+        private System.Windows.Forms.TextBox flow3FromTextBox;
+        private System.Windows.Forms.CheckBox flow3CheckBox;
+        private System.Windows.Forms.GroupBox flow2GroupBox;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label toLabel3;
+        private System.Windows.Forms.Label fromLabel3;
+        private System.Windows.Forms.TextBox flow2ToTextBox;
+        private System.Windows.Forms.TextBox flow2FromTextBox;
+        private System.Windows.Forms.CheckBox flow2CheckBox;
+        private System.Windows.Forms.GroupBox flow1GroupBox;
+        private System.Windows.Forms.Label m3hLabel2;
+        private System.Windows.Forms.Label m3hLabel1;
+        private System.Windows.Forms.Label toLabel2;
+        private System.Windows.Forms.Label fromLabel2;
+        private System.Windows.Forms.TextBox flow1ToTextBox;
+        private System.Windows.Forms.TextBox flow1FromTextBox;
+        private System.Windows.Forms.CheckBox flow1CheckBox;
+        private System.Windows.Forms.Label flow1ToExclamation;
+        private System.Windows.Forms.Label flow1FromExclamation;
+        private System.Windows.Forms.Label flow3ToExclamation;
+        private System.Windows.Forms.Label flow3FromExclamation;
+        private System.Windows.Forms.Label flow2ToExclamation;
+        private System.Windows.Forms.Label flow2FromExclamation;
+        private System.Windows.Forms.GroupBox flow5GroupBox;
+        private System.Windows.Forms.Label flow5ToExclamation;
+        private System.Windows.Forms.Label flow5FromExclamation;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label toLabel6;
+        private System.Windows.Forms.Label fromLabel6;
+        private System.Windows.Forms.TextBox flow5ToTextBox;
+        private System.Windows.Forms.TextBox flow5FromTextBox;
+        private System.Windows.Forms.CheckBox flow5CheckBox;
+        private System.Windows.Forms.GroupBox flow4GroupBox;
+        private System.Windows.Forms.Label flow4ToExclamation;
+        private System.Windows.Forms.Label flow4FromExclamation;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label toLabel5;
+        private System.Windows.Forms.Label fromLabel5;
+        private System.Windows.Forms.TextBox flow4ToTextBox;
+        private System.Windows.Forms.TextBox flow4FromTextBox;
+        private System.Windows.Forms.CheckBox flow4CheckBox;
+    }
+}

Statistics/UserControls/MidOrWaterMetersCtrl.cs

@@ -0,0 +1,333 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using Results.Entities;
+using Statistics.Resources;
+using System.Globalization;
+
+namespace Statistics.UserControls
+{
+    public partial class MidOrWaterMetersCtrl : UserControl
+    {
+        public MidId MidId;
+        public StatisticsDlg Parent;
+
+
+        public bool IsFlowEnabled(int i)
+        {
+            switch (i)
+            {
+                case 1: return flow1CheckBox.Checked;
+                case 2: return flow2CheckBox.Checked;
+                case 3: return flow3CheckBox.Checked;
+                case 4: return flow4CheckBox.Checked;
+                case 5: return flow5CheckBox.Checked;
+                default: return false;
+            }
+        }
+
+        public double FlowFrom(int i)
+        {
+            switch (i)
+            {
+                case 1: return flow1From;
+                case 2: return flow2From;
+                case 3: return flow3From;
+                case 4: return flow4From;
+                case 5: return flow5From;
+                default: return 0;
+            }
+        }
+
+        public double FlowTo(int i)
+        {
+            switch (i)
+            {
+                case 1: return flow1To;
+                case 2: return flow2To;
+                case 3: return flow3To;
+                case 4: return flow4To;
+                case 5: return flow5To;
+                default: return 0;
+            }
+        }
+
+
+        /// All flows are in m3/h
+        double flow1From;
+        double flow1To;
+        double flow2From;
+        double flow2To;
+        double flow3From;
+        double flow3To;
+        double flow4From;
+        double flow4To;
+        double flow5From;
+        double flow5To;
+
+
+        StatisticsCtrl GetStatistics(int i)
+        {
+            if ((i >= 0) && (i < benchesTabControl.TabPages.Count) && benchesTabControl.TabPages[i].Controls.Count > 0)
+            {
+                return benchesTabControl.TabPages[i].Controls[0] as StatisticsCtrl;
+            }
+            else return null;
+        }
+
+
+        public IList<TestRslt> UpdateRequest(int benchId)
+        {
+            return Parent.UpdateRequest(benchId, MidId);
+        }
+
+
+        public MidOrWaterMetersCtrl()
+        {
+            InitializeComponent();
+
+            ManageCheckGroupBox(flow1CheckBox, flow1GroupBox);
+            ManageCheckGroupBox(flow2CheckBox, flow2GroupBox);
+            ManageCheckGroupBox(flow3CheckBox, flow3GroupBox);
+            ManageCheckGroupBox(flow4CheckBox, flow4GroupBox);
+            ManageCheckGroupBox(flow5CheckBox, flow5GroupBox);
+
+            for (int i = 0; i < benchesTabControl.TabPages.Count; i++ )
+            {
+                TabPage tp = benchesTabControl.TabPages[i];
+                if ((tp.Controls.Count > 0) && (tp.Controls[0] is StatisticsCtrl))
+                {
+                    (tp.Controls[0] as StatisticsCtrl).Id = i;
+                    (tp.Controls[0] as StatisticsCtrl).MidCtrl = this;
+                }
+            }
+        }
+
+        void Localize()
+        {
+            flow1CheckBox.Text = string.Format("{0} 1", Strings.Flow);
+            flow2CheckBox.Text = string.Format("{0} 2", Strings.Flow);
+            flow3CheckBox.Text = string.Format("{0} 3", Strings.Flow);
+            flow4CheckBox.Text = string.Format("{0} 4", Strings.Flow);
+            flow5CheckBox.Text = string.Format("{0} 5", Strings.Flow);
+            fromLabel2.Text = Strings.From;
+            fromLabel3.Text = Strings.From;
+            fromLabel4.Text = Strings.From;
+            fromLabel5.Text = Strings.From;
+            fromLabel6.Text = Strings.From;
+            toLabel2.Text = Strings.To;
+            toLabel3.Text = Strings.To;
+            toLabel4.Text = Strings.To;
+            toLabel5.Text = Strings.To;
+            toLabel6.Text = Strings.To;
+        }
+
+        public void Data2UI()
+        {
+            LocalSettings ls = Program.LocalSettings;
+            flow1CheckBox.Checked = ls.GetFlowEnabled(MidId, 0);
+            flow2CheckBox.Checked = ls.GetFlowEnabled(MidId, 1);
+            flow3CheckBox.Checked = ls.GetFlowEnabled(MidId, 2);
+            flow4CheckBox.Checked = ls.GetFlowEnabled(MidId, 3);
+            flow5CheckBox.Checked = ls.GetFlowEnabled(MidId, 4);
+            flow1From = ls.GetFlowFrom(MidId, 0);
+            flow2From = ls.GetFlowFrom(MidId, 1);
+            flow3From = ls.GetFlowFrom(MidId, 2);
+            flow4From = ls.GetFlowFrom(MidId, 3);
+            flow5From = ls.GetFlowFrom(MidId, 4);
+            flow1FromTextBox.Text = flow1From.ToString();
+            flow2FromTextBox.Text = flow2From.ToString();
+            flow3FromTextBox.Text = flow3From.ToString();
+            flow4FromTextBox.Text = flow4From.ToString();
+            flow5FromTextBox.Text = flow5From.ToString();
+            flow1To = ls.GetFlowTo(MidId, 0);
+            flow2To = ls.GetFlowTo(MidId, 1);
+            flow3To = ls.GetFlowTo(MidId, 2);
+            flow4To = ls.GetFlowTo(MidId, 3);
+            flow5To = ls.GetFlowTo(MidId, 4);
+            flow1ToTextBox.Text = flow1To.ToString();
+            flow2ToTextBox.Text = flow2To.ToString();
+            flow3ToTextBox.Text = flow3To.ToString();
+            flow4ToTextBox.Text = flow4To.ToString();
+            flow5ToTextBox.Text = flow5To.ToString();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns>true when successful</returns>
+        public void UI2Data()
+        {
+            LocalSettings ls = Program.LocalSettings;
+            ls.SetFlowEnabled(MidId, 0, flow1CheckBox.Checked);
+            ls.SetFlowEnabled(MidId, 1, flow2CheckBox.Checked);
+            ls.SetFlowEnabled(MidId, 2, flow3CheckBox.Checked);
+            ls.SetFlowEnabled(MidId, 3, flow4CheckBox.Checked);
+            ls.SetFlowEnabled(MidId, 4, flow5CheckBox.Checked);
+            ls.SetFlowFrom(MidId, 0, flow1From);
+            ls.SetFlowFrom(MidId, 1, flow2From);
+            ls.SetFlowFrom(MidId, 2, flow3From);
+            ls.SetFlowFrom(MidId, 3, flow4From);
+            ls.SetFlowFrom(MidId, 4, flow5From);
+            ls.SetFlowTo(MidId, 0, flow1To);
+            ls.SetFlowTo(MidId, 1, flow2To);
+            ls.SetFlowTo(MidId, 2, flow3To);
+            ls.SetFlowTo(MidId, 3, flow4To);
+            ls.SetFlowTo(MidId, 4, flow5To);
+        }
+
+        private void flow1CheckBox_CheckedChanged(object sender, EventArgs e) { ManageCheckGroupBox(flow1CheckBox, flow1GroupBox); }
+        private void flow2CheckBox_CheckedChanged(object sender, EventArgs e) { ManageCheckGroupBox(flow2CheckBox, flow2GroupBox); }
+        private void flow3CheckBox_CheckedChanged(object sender, EventArgs e) { ManageCheckGroupBox(flow3CheckBox, flow3GroupBox); }
+        private void flow4CheckBox_CheckedChanged(object sender, EventArgs e) { ManageCheckGroupBox(flow4CheckBox, flow4GroupBox); }
+        private void flow5CheckBox_CheckedChanged(object sender, EventArgs e) { ManageCheckGroupBox(flow5CheckBox, flow5GroupBox); }
+
+        private void ManageCheckGroupBox(CheckBox chk, GroupBox grp)
+        {
+            /// Make sure the CheckBox isn't in the GroupBox. This will only happen the first time.
+            if (chk.Parent == grp)
+            {
+                grp.Parent.Controls.Add(chk);                                       /// Reparent the CheckBox so it's not in the GroupBox.
+                chk.Location = new Point(chk.Left + grp.Left, chk.Top + grp.Top);   /// Adjust the CheckBox's location.
+                chk.BringToFront();                                                 /// Move the CheckBox to the top of the stacking order.
+            }
+
+            /// Enable or disable the GroupBox.
+            grp.Enabled = chk.Checked;
+        }
+
+        private void flow1FromTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow1FromTextBox.Text))
+            {
+                flow1From = 0;
+                flow1FromExclamation.Visible = false;
+            }
+            else
+                flow1FromExclamation.Visible = !((double.TryParse(flow1FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow1From) ||
+                                                  double.TryParse(flow1FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow1From)) &&
+                                                  (flow1From >= 0));
+        }
+
+        private void flow1ToTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow1ToTextBox.Text))
+            {
+                flow1To = 0;
+                flow1ToExclamation.Visible = false;
+            }
+            else
+                flow1ToExclamation.Visible = !((double.TryParse(flow1ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow1To) ||
+                                                double.TryParse(flow1ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow1To)) &&
+                                                (flow1To >= 0));
+        }
+
+        private void flow2FromTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow2FromTextBox.Text))
+            {
+                flow2From = 0;
+                flow2FromExclamation.Visible = false;
+            }
+            else
+                flow2FromExclamation.Visible = !((double.TryParse(flow2FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow2From) ||
+                                                  double.TryParse(flow2FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow2From)) &&
+                                                  (flow2From >= 0));
+        }
+
+        private void flow2ToTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow2ToTextBox.Text))
+            {
+                flow2To = 0;
+                flow2ToExclamation.Visible = false;
+            }
+            else
+                flow2ToExclamation.Visible = !((double.TryParse(flow2ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow2To) ||
+                                                double.TryParse(flow2ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow2To)) &&
+                                                (flow2To >= 0));
+        }
+
+        private void flow3FromTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow3FromTextBox.Text))
+            {
+                flow3From = 0;
+                flow3FromExclamation.Visible = false;
+            }
+            else
+                flow3FromExclamation.Visible = !((double.TryParse(flow3FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow3From) ||
+                                                  double.TryParse(flow3FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow3From)) &&
+                                                  (flow3From >= 0));
+        }
+
+        private void flow3ToTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow3ToTextBox.Text))
+            {
+                flow3To = 0;
+                flow3ToExclamation.Visible = false;
+            }
+            else
+                flow3ToExclamation.Visible = !((double.TryParse(flow3ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow3To) ||
+                                                double.TryParse(flow3ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow3To)) &&
+                                                (flow3To >= 0));
+        }
+
+        private void flow4FromTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow4FromTextBox.Text))
+            {
+                flow4From = 0;
+                flow4FromExclamation.Visible = false;
+            }
+            else
+                flow4FromExclamation.Visible = !((double.TryParse(flow4FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow4From) ||
+                                                  double.TryParse(flow4FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow4From)) &&
+                                                  (flow4From >= 0));
+        }
+
+        private void flow4ToTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow4ToTextBox.Text))
+            {
+                flow4To = 0;
+                flow4ToExclamation.Visible = false;
+            }
+            else
+                flow4ToExclamation.Visible = !((double.TryParse(flow4ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow4To) ||
+                                                double.TryParse(flow4ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow4To)) &&
+                                                (flow4To >= 0));
+        }
+
+        private void flow5FromTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow5FromTextBox.Text))
+            {
+                flow5From = 0;
+                flow5FromExclamation.Visible = false;
+            }
+            else
+                flow5FromExclamation.Visible = !((double.TryParse(flow5FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow5From) ||
+                                                  double.TryParse(flow5FromTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow5From)) &&
+                                                  (flow5From >= 0));
+        }
+
+        private void flow5ToTextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(flow5ToTextBox.Text))
+            {
+                flow5To = 0;
+                flow5ToExclamation.Visible = false;
+            }
+            else
+                flow5ToExclamation.Visible = !((double.TryParse(flow5ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out flow5To) ||
+                                                double.TryParse(flow5ToTextBox.Text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out flow5To)) &&
+                                                (flow5To >= 0));
+        }
+    }
+}

Statistics/UserControls/MidOrWaterMetersCtrl.resx

@@ -0,0 +1,120 @@
+<?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>

Statistics/UserControls/StatisticsCtrl.Designer.cs

@@ -0,0 +1,158 @@
+namespace Statistics.UserControls
+{
+    partial class StatisticsCtrl
+    {
+        /// <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()
+        {
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+            System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series7 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series8 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series9 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series10 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            this.updateButton = new System.Windows.Forms.Button();
+            this.chart1 = new System.Windows.Forms.DataVisualization.Charting.Chart();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.exportButton = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.chart1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // updateButton
+            // 
+            this.updateButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.updateButton.Location = new System.Drawing.Point(3, 7);
+            this.updateButton.Name = "updateButton";
+            this.updateButton.Size = new System.Drawing.Size(90, 43);
+            this.updateButton.TabIndex = 4;
+            this.updateButton.Text = "Update data";
+            this.updateButton.UseVisualStyleBackColor = true;
+            this.updateButton.Click += new System.EventHandler(this.updateButton_Click);
+            // 
+            // chart1
+            // 
+            chartArea2.Name = "ChartArea1";
+            this.chart1.ChartAreas.Add(chartArea2);
+            this.chart1.Dock = System.Windows.Forms.DockStyle.Fill;
+            legend2.Name = "Legend1";
+            this.chart1.Legends.Add(legend2);
+            this.chart1.Location = new System.Drawing.Point(0, 0);
+            this.chart1.Name = "chart1";
+            series6.ChartArea = "ChartArea1";
+            series6.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
+            series6.Color = System.Drawing.Color.ForestGreen;
+            series6.Legend = "Legend1";
+            series6.Name = "Flow 1";
+            series7.ChartArea = "ChartArea1";
+            series7.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
+            series7.Color = System.Drawing.Color.Red;
+            series7.Legend = "Legend1";
+            series7.Name = "Flow 2";
+            series8.ChartArea = "ChartArea1";
+            series8.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
+            series8.Color = System.Drawing.Color.Blue;
+            series8.Legend = "Legend1";
+            series8.Name = "Flow 3";
+            series9.ChartArea = "ChartArea1";
+            series9.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
+            series9.Color = System.Drawing.Color.DarkOrange;
+            series9.Legend = "Legend1";
+            series9.Name = "Flow 4";
+            series10.ChartArea = "ChartArea1";
+            series10.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Point;
+            series10.Color = System.Drawing.Color.Fuchsia;
+            series10.Legend = "Legend1";
+            series10.Name = "Flow 5";
+            this.chart1.Series.Add(series6);
+            this.chart1.Series.Add(series7);
+            this.chart1.Series.Add(series8);
+            this.chart1.Series.Add(series9);
+            this.chart1.Series.Add(series10);
+            this.chart1.Size = new System.Drawing.Size(476, 381);
+            this.chart1.TabIndex = 5;
+            this.chart1.Text = "chart1";
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer1.IsSplitterFixed = true;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.chart1);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.exportButton);
+            this.splitContainer1.Panel2.Controls.Add(this.updateButton);
+            this.splitContainer1.Size = new System.Drawing.Size(577, 381);
+            this.splitContainer1.SplitterDistance = 476;
+            this.splitContainer1.SplitterWidth = 1;
+            this.splitContainer1.TabIndex = 6;
+            // 
+            // exportButton
+            // 
+            this.exportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.exportButton.Location = new System.Drawing.Point(3, 56);
+            this.exportButton.Name = "exportButton";
+            this.exportButton.Size = new System.Drawing.Size(90, 43);
+            this.exportButton.TabIndex = 5;
+            this.exportButton.Text = "Export";
+            this.exportButton.UseVisualStyleBackColor = true;
+            this.exportButton.Click += new System.EventHandler(this.exportButton_Click);
+            // 
+            // StatisticsCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.splitContainer1);
+            this.Name = "StatisticsCtrl";
+            this.Size = new System.Drawing.Size(577, 381);
+            ((System.ComponentModel.ISupportInitialize)(this.chart1)).EndInit();
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button updateButton;
+        private System.Windows.Forms.DataVisualization.Charting.Chart chart1;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.Button exportButton;
+    }
+}

Statistics/UserControls/StatisticsCtrl.cs

@@ -0,0 +1,62 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using System.Windows.Forms.DataVisualization.Charting;
+using Results.Entities;
+using Statistics.Resources;
+
+namespace Statistics.UserControls
+{
+    public partial class StatisticsCtrl : UserControl
+    {
+        public int Id;								/// Index of the tab page
+        public MidOrWaterMetersCtrl MidCtrl;    /// Reference to the parent control
+
+        public StatisticsCtrl()
+        {
+            InitializeComponent();
+            chart1.ChartAreas[0].AxisX.LabelStyle.Format = "dd.MM.yy";
+            chart1.ChartAreas[0].AxisX.Interval = 1;
+            chart1.ChartAreas[0].AxisX.IntervalType = DateTimeIntervalType.Days;
+        }
+
+        private void updateButton_Click(object sender, EventArgs e)
+        {
+            if (MidCtrl != null)
+            {
+                for (int i = 1; i <= 5; i++)
+                {
+                    chart1.Series[string.Format("Flow {0}", i)].Points.Clear();
+                }
+
+                IList<TestRslt> results = MidCtrl.UpdateRequest(Id);
+
+                if (results != null)
+                {
+                    foreach (var r in results)
+                    {
+                        if (r.ErrorMaster != 0)
+                        {
+                            for (int i = 1; i <= 5; i++)
+                            {
+                                if (MidCtrl.IsFlowEnabled(i) && (MidCtrl.FlowFrom(i) <= r.FlowMean) && (r.FlowMean <= MidCtrl.FlowTo(i)))
+                                {
+                                    chart1.Series[string.Format("Flow {0}", i)].Points.AddXY(r.StartTime, r.ErrorMaster);
+                                }
+                            }
+                        }
+                    }
+                    return;
+                }
+            }
+        }
+
+        private void exportButton_Click(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

Statistics/UserControls/StatisticsCtrl.resx

@@ -0,0 +1,120 @@
+<?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>

Statistics/app.config

@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

TBF.sln

@@ -46,6 +46,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TracingDB", "TracingDB\Trac
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GemCard", "GemCard\GemCard.csproj", "{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Statistics", "Statistics\Statistics.csproj", "{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -174,6 +176,16 @@ Global
 		{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}.Release|Mixed Platforms.Build.0 = Release|x86
 		{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}.Release|x86.ActiveCfg = Release|x86
 		{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}.Release|x86.Build.0 = Release|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Debug|x86.ActiveCfg = Debug|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Debug|x86.Build.0 = Debug|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|Any CPU.ActiveCfg = Release|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|Mixed Platforms.Build.0 = Release|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|x86.ActiveCfg = Release|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TBF/BenchControl/BenchInfo/Extended/ComponentCfg.cs

@@ -215,9 +215,9 @@ namespace TBF.BenchControl.BenchInfo.Extended
             return pars;
         }
 
-        public void UpdateEmbeddedDbEntity()
+        public bool UpdateEmbeddedDbEntity()
         {
-            /// Do nothing
+            return true;    /// =OK, do nothing
         }
     }
 }

TBF/BenchControl/BenchInfo/Munich/Component.cs

@@ -29,6 +29,9 @@ namespace TBF.BenchControl.BenchInfo.Munich
         public string Address4 { get { return string.Empty; } }
         public string Address5 { get { return string.Empty; } }
         public RemoteDBUse RemoteDBUse { get { return RemoteDBUse.LocalDBOnly; } }
+#if ORACLE_DB
+        public int MaxTestIndex { get { return 0; } }
+#endif
 
 		public Component()
 		{

TBF/BenchControl/BenchInfo/iPerl/Component.cs

@@ -0,0 +1,46 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using log4net;
+using Config.Entities;
+using TBF.BenchControl;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.BenchInfo.iPerl
+{
+	/// <summary>
+	/// Holds information identifying the test bench.
+	/// </summary>
+	public class Component : ComponentBase, GenericDevices.IBenchInfo
+	{
+        private static readonly ILog log = LogManager.GetLogger(typeof(Component));
+		public override string ToString() { return string.Format("BenchInfo.iPerl({0})", Cfg.ToString(1)); }
+
+        readonly ComponentCfg myCfg;
+
+		public string TestBenchName { get { return myCfg.TestBenchName; } }
+		public int TestBenchId { get { return myCfg.TestBenchId; } }
+        public string Address1 { get { return myCfg.Address1; } }
+        public string Address2 { get { return myCfg.Address2; } }
+        public string Address3 { get { return myCfg.Address3; } }
+        public string Address4 { get { return myCfg.Address4; } }
+        public string Address5 { get { return myCfg.Address5; } }
+        public RemoteDBUse RemoteDBUse { get { return myCfg.RemoteDBUse; } }
+        public Side Side { get { return myCfg.Side; } }
+        public int MaxTestIndex { get { return myCfg.MaxTestIndex; } }       /// (MaxPruefindex % 100) value when to reject water meters completely if they are NOK
+
+		public Component()
+		{
+		}
+
+		public Component(Generic.IComponentCfg cfg)
+			: base(cfg)
+		{
+			myCfg = cfg as ComponentCfg;
+            log.Debug(this.ToString());
+        }
+	}
+}

TBF/BenchControl/BenchInfo/iPerl/ComponentCfg.cs

@@ -0,0 +1,266 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using Config.Entities;
+using TBF.BenchControl.Generic;
+using TBF.Resources;
+
+namespace TBF.BenchControl.BenchInfo.iPerl
+{
+	/// <summary>
+	/// Holds information identifying the test bench - serializable configuration.
+	/// </summary>
+	public class ComponentCfg : ComponentCfgBase, Generic.IComponentCfg, Config.Entities.IParamsProvider
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ComponentCfg) })[0];
+        public override XmlSerializer GetSerializer() { return Serializer; }
+
+		public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
+
+		///
+		/// Serialized parameters 
+		///
+		public string TestBenchName;
+		public int TestBenchId;
+		public string Address1;
+		public string Address2;
+		public string Address3;
+		public string Address4;
+		public string Address5;
+		public string ApprovalId;
+		public string ApprovalDate;
+		public string ApprovedBy;
+        public RemoteDBUse RemoteDBUse;
+        public Side Side;
+        public int MaxTestIndex;       /// (MaxPruefindex % 100) value when to reject water meters completely if they are NOK
+
+		/// Private parameterless constructor invoked by all other (public) constructors
+		ComponentCfg() {}
+
+        public ComponentCfg(string name, IComponentFactory factory)
+            : this()
+        {
+            Factory = factory;
+            Name = name;
+            ParentName = string.Empty;
+            InitializeAll();
+        }
+
+        public string ComponentName { get { return Name; } }
+
+ 		public void InitializeAll()
+		{
+            TestBenchName = "1";
+            TestBenchId = 1;
+
+            Address1 = string.Empty;
+            Address2 = string.Empty;
+            Address3 = string.Empty;
+            Address4 = string.Empty;
+            Address5 = string.Empty;
+
+            ApprovalId = string.Empty;
+            ApprovalDate = string.Empty;
+            ApprovedBy = string.Empty;
+
+            RemoteDBUse = RemoteDBUse.LocalDBOnly;
+            Side = Side.Left;
+            MaxTestIndex = 4;
+        }
+
+        string[] paramNames = new string[]
+		{
+            "Test bench name",
+            "Test bench ID",
+            "Address 1",
+            "Address 2",
+            "Address 3",
+            "Address 4",
+            "Address 5",
+            "Approval",
+            "Approval date",
+            "Approved by",
+            "Remote DB use",
+            Strings.Side,
+            "Max.test index",
+        };
+        public string ParamName(int i) { return paramNames[i]; }
+        public int ParamsCount() { return paramNames.Length; }
+
+        public IList<string> ParamValues(int i)
+        {
+            if (i == 10)
+            {
+                IList<string> list = new List<string>();
+                for (RemoteDBUse rdbu = 0; rdbu < RemoteDBUse.Count; rdbu++) list.Add(rdbu.ToDescription());
+                return list;
+            }
+            else if (i == 11)
+            {
+                IList<string> list = new List<string>();
+                for (Side side = 0; side < Side.Count; side++) list.Add(side.ToDescription());
+                return list;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public string ToString(int i)
+        {
+            if (i == -1)
+            {
+                return string.Format("{0}: Bench name={1}, Bench Id={2}, Procedures={3}", Name, TestBenchName, TestBenchId, RemoteDBUse.ToDescription());
+            }
+
+            switch (i)
+            {
+                case 0: return TestBenchName;
+                case 1: return TestBenchId.ToString();
+                case 2: return Address1;
+                case 3: return Address2;
+                case 4: return Address3;
+                case 5: return Address4;
+                case 6: return Address5;
+                case 7: return ApprovalId;
+                case 8: return ApprovalDate;
+                case 9: return ApprovedBy;
+                case 10: return RemoteDBUse.ToDescription();
+                case 11: return Side.ToDescription();
+                case 12: return MaxTestIndex.ToString();
+                default: return string.Empty;
+            }
+        }
+
+        public CfgUpdateFlags UpdateParam(int i, string strValue)
+        {
+            switch (i)
+            {
+                case 0: TestBenchName = strValue; return CfgUpdateFlags.RestartRqrd;
+                case 1: TestBenchId = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
+                case 2: Address1 = strValue; return CfgUpdateFlags.RestartRqrd;
+                case 3: Address2 = strValue; return CfgUpdateFlags.RestartRqrd;
+                case 4: Address3 = strValue; return CfgUpdateFlags.RestartRqrd;
+                case 5: Address4 = strValue; return CfgUpdateFlags.RestartRqrd;
+                case 6: Address5 = strValue; return CfgUpdateFlags.RestartRqrd;
+                case 7: ApprovalId = strValue; return CfgUpdateFlags.RestartRqrd;
+                case 8: ApprovalDate = strValue; return CfgUpdateFlags.RestartRqrd;
+                case 9: ApprovedBy = strValue; return CfgUpdateFlags.RestartRqrd;
+
+                case 10:
+                    for (RemoteDBUse rdbu = 0; rdbu < RemoteDBUse.Count; rdbu++)
+                    {
+                        if (strValue == rdbu.ToDescription())
+                        {
+                            if (RemoteDBUse != rdbu)
+                            {
+                                RemoteDBUse = rdbu;
+                                return CfgUpdateFlags.RestartRqrd;
+                            }
+                            else
+                            {
+                                return CfgUpdateFlags.None;
+                            }
+                        }
+                    }
+                    return CfgUpdateFlags.Error;
+
+                case 11:
+                    for (Side side = 0; side < Side.Count; side++)
+                    {
+                        if (strValue == side.ToDescription())
+                        {
+                            if (Side != side)
+                            {
+                                Side = side;
+                                return CfgUpdateFlags.RestartRqrd;
+                            }
+                            else
+                            {
+                                return CfgUpdateFlags.None;
+                            }
+                        }
+                    }
+                    return CfgUpdateFlags.Error;
+
+				case 12: MaxTestIndex = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
+                default: return CfgUpdateFlags.None;
+            }
+        }
+
+        public bool ValidateParam(int i, string strValue, out string message)
+        {
+            message = string.Empty;
+            int idummy;
+
+            switch (i)
+            {
+                case 0:
+                case 2:
+                case 3:
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                    return true;
+                case 1:
+                case 12:
+                    if (int.TryParse(strValue, out idummy) && (idummy >= 0)) return true;
+                    break;
+                case 10:
+                    for (RemoteDBUse rdbu = 0; rdbu < RemoteDBUse.Count; rdbu++)
+                    {
+                        if (strValue == rdbu.ToDescription()) return true;
+                    }
+                    return false;
+                case 11:
+                    for (Side side = 0; side < Side.Count; side++)
+                    {
+                        if (strValue == side.ToDescription()) return true;
+                    }
+                    return false;
+                default:
+                    message = "Invalid index";
+                    return false;
+            }
+
+            message = ParamName(i) + " is invalid";
+            return false;
+        }
+
+        void CopyContentTo(ComponentCfg prms)
+        {
+            prms.TestBenchName = this.TestBenchName;
+            prms.TestBenchId = this.TestBenchId;
+            prms.Address1 = this.Address1;
+            prms.Address2 = this.Address2;
+            prms.Address3 = this.Address3;
+            prms.Address4 = this.Address4;
+            prms.Address5 = this.Address5;
+            prms.ApprovalId = this.ApprovalId;
+            prms.ApprovalDate = this.ApprovalDate;
+            prms.ApprovedBy = this.ApprovedBy;
+            prms.RemoteDBUse = this.RemoteDBUse;
+            prms.Side = this.Side;
+            prms.MaxTestIndex = this.MaxTestIndex;
+        }
+
+        public Config.Entities.IParamsProvider Clone()
+        {
+            ComponentCfg pars = new ComponentCfg();
+            CopyContentTo(pars);
+            return pars;
+        }
+
+        public bool UpdateEmbeddedDbEntity()
+        {
+            return true;    /// =OK, do nothing
+        }
+    }
+}

TBF/BenchControl/BenchInfo/iPerl/ComponentFactory.cs

@@ -0,0 +1,26 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System.Collections.Generic;
+using TBF.BenchControl.Generic;
+
+namespace TBF.BenchControl.BenchInfo.iPerl
+{
+	public class ComponentFactory : IComponentFactory
+	{
+		public string ClassName { get { return "BenchInfo.iPerl"; } }
+
+		public void ResetStaticProperties() { Component.ResetStaticProperties(); }
+
+		public IComponent DummyComponent() { return new Component(); }
+
+		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
+
+        public IComponentCfg DefaultConfig() { return new ComponentCfg("BenchInfo.iPerl", this); }
+
+        public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
+        {
+            return ComponentCfgBase.CreateFromDbEntity(ComponentCfg.Serializer, component, this);
+        }
+	}
+}

TBF/BenchControl/Configs/ParamsProvider/ComponentCfgCtrl.cs

@@ -188,6 +188,12 @@ namespace TBF.BenchControl.Configs.ParamsProvider
             {
                 flags |= paramsProvider.UpdateParam(itemNr, e.DisplayText);
             }
+            else
+            {
+                MessageBox.Show(message);
+                e.DisplayText = e.Item.SubItems[e.SubItem].Text;
+                e.Cancel = true;
+            }
         }
 	}
 }

TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs

@@ -31,325 +31,361 @@ namespace TBF.BenchControl.DataEntry.Combined
         /// </summary>
         private void InitializeComponent()
         {
-			this.okButton = new System.Windows.Forms.Button();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.aux1ComboBox = new System.Windows.Forms.ComboBox();
-			this.main1ComboBox = new System.Windows.Forms.ComboBox();
-			this.checkBox1 = new System.Windows.Forms.CheckBox();
-			this.auxSN1Label = new System.Windows.Forms.Label();
-			this.mainSN1Label = new System.Windows.Forms.Label();
-			this.groupBox2 = new System.Windows.Forms.GroupBox();
-			this.aux2ComboBox = new System.Windows.Forms.ComboBox();
-			this.main2ComboBox = new System.Windows.Forms.ComboBox();
-			this.checkBox2 = new System.Windows.Forms.CheckBox();
-			this.auxSN2Label = new System.Windows.Forms.Label();
-			this.mainSN2Label = new System.Windows.Forms.Label();
-			this.groupBox3 = new System.Windows.Forms.GroupBox();
-			this.aux3ComboBox = new System.Windows.Forms.ComboBox();
-			this.main3ComboBox = new System.Windows.Forms.ComboBox();
-			this.checkBox3 = new System.Windows.Forms.CheckBox();
-			this.auxSN3Label = new System.Windows.Forms.Label();
-			this.mainSN3Label = new System.Windows.Forms.Label();
-			this.clearButton = new System.Windows.Forms.Button();
-			this.orderGroupBox = new System.Windows.Forms.GroupBox();
-			this.orderComboBox = new System.Windows.Forms.ComboBox();
-			this.groupBox1.SuspendLayout();
-			this.groupBox2.SuspendLayout();
-			this.groupBox3.SuspendLayout();
-			this.orderGroupBox.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// okButton
-			// 
-			this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.okButton.ForeColor = System.Drawing.Color.Black;
-			this.okButton.Location = new System.Drawing.Point(589, 33);
-			this.okButton.Name = "okButton";
-			this.okButton.Size = new System.Drawing.Size(117, 63);
-			this.okButton.TabIndex = 0;
-			this.okButton.Text = "OK";
-			this.okButton.UseVisualStyleBackColor = true;
-			this.okButton.Click += new System.EventHandler(this.okButton_Click);
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.Controls.Add(this.aux1ComboBox);
-			this.groupBox1.Controls.Add(this.main1ComboBox);
-			this.groupBox1.Controls.Add(this.checkBox1);
-			this.groupBox1.Controls.Add(this.auxSN1Label);
-			this.groupBox1.Controls.Add(this.mainSN1Label);
-			this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.groupBox1.ForeColor = System.Drawing.Color.Black;
-			this.groupBox1.Location = new System.Drawing.Point(28, 118);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(533, 137);
-			this.groupBox1.TabIndex = 1;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Water Meter 1";
-			this.groupBox1.Visible = false;
-			// 
-			// aux1ComboBox
-			// 
-			this.aux1ComboBox.FormattingEnabled = true;
-			this.aux1ComboBox.Location = new System.Drawing.Point(287, 83);
-			this.aux1ComboBox.Name = "aux1ComboBox";
-			this.aux1ComboBox.Size = new System.Drawing.Size(175, 31);
-			this.aux1ComboBox.TabIndex = 6;
-			this.aux1ComboBox.Visible = false;
-			this.aux1ComboBox.SelectedIndexChanged += new System.EventHandler(this.aux1ComboBox_SelectedIndexChanged);
-			this.aux1ComboBox.TextChanged += new System.EventHandler(this.aux1ComboBox_TextChanged);
-			this.aux1ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.aux1ComboBox_KeyPress);
-			// 
-			// main1ComboBox
-			// 
-			this.main1ComboBox.FormattingEnabled = true;
-			this.main1ComboBox.Location = new System.Drawing.Point(287, 37);
-			this.main1ComboBox.Name = "main1ComboBox";
-			this.main1ComboBox.Size = new System.Drawing.Size(175, 31);
-			this.main1ComboBox.TabIndex = 5;
-			this.main1ComboBox.Visible = false;
-			this.main1ComboBox.SelectedIndexChanged += new System.EventHandler(this.main1ComboBox_SelectedIndexChanged);
-			this.main1ComboBox.TextChanged += new System.EventHandler(this.main1ComboBox_TextChanged);
-			this.main1ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.main1ComboBox_KeyPress);
-			// 
-			// checkBox1
-			// 
-			this.checkBox1.AutoSize = true;
-			this.checkBox1.Font = new System.Drawing.Font("Verdana", 27.75F);
-			this.checkBox1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-			this.checkBox1.Location = new System.Drawing.Point(490, 69);
-			this.checkBox1.Name = "checkBox1";
-			this.checkBox1.Size = new System.Drawing.Size(15, 14);
-			this.checkBox1.TabIndex = 4;
-			this.checkBox1.UseVisualStyleBackColor = true;
-			this.checkBox1.Visible = false;
-			// 
-			// auxSN1Label
-			// 
-			this.auxSN1Label.AutoSize = true;
-			this.auxSN1Label.Location = new System.Drawing.Point(21, 86);
-			this.auxSN1Label.Name = "auxSN1Label";
-			this.auxSN1Label.Size = new System.Drawing.Size(193, 23);
-			this.auxSN1Label.TabIndex = 2;
-			this.auxSN1Label.Text = "Aux. WM Serial Nr.";
-			this.auxSN1Label.Visible = false;
-			// 
-			// mainSN1Label
-			// 
-			this.mainSN1Label.AutoSize = true;
-			this.mainSN1Label.Location = new System.Drawing.Point(21, 40);
-			this.mainSN1Label.Name = "mainSN1Label";
-			this.mainSN1Label.Size = new System.Drawing.Size(195, 23);
-			this.mainSN1Label.TabIndex = 0;
-			this.mainSN1Label.Text = "Main WM Serial Nr.";
-			this.mainSN1Label.Visible = false;
-			// 
-			// groupBox2
-			// 
-			this.groupBox2.Controls.Add(this.aux2ComboBox);
-			this.groupBox2.Controls.Add(this.main2ComboBox);
-			this.groupBox2.Controls.Add(this.checkBox2);
-			this.groupBox2.Controls.Add(this.auxSN2Label);
-			this.groupBox2.Controls.Add(this.mainSN2Label);
-			this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.groupBox2.ForeColor = System.Drawing.Color.Black;
-			this.groupBox2.Location = new System.Drawing.Point(28, 275);
-			this.groupBox2.Name = "groupBox2";
-			this.groupBox2.Size = new System.Drawing.Size(533, 137);
-			this.groupBox2.TabIndex = 2;
-			this.groupBox2.TabStop = false;
-			this.groupBox2.Text = "Water Meter 2";
-			this.groupBox2.Visible = false;
-			// 
-			// aux2ComboBox
-			// 
-			this.aux2ComboBox.FormattingEnabled = true;
-			this.aux2ComboBox.Location = new System.Drawing.Point(287, 83);
-			this.aux2ComboBox.Name = "aux2ComboBox";
-			this.aux2ComboBox.Size = new System.Drawing.Size(175, 31);
-			this.aux2ComboBox.TabIndex = 10;
-			this.aux2ComboBox.Visible = false;
-			this.aux2ComboBox.SelectedIndexChanged += new System.EventHandler(this.aux2ComboBox_SelectedIndexChanged);
-			this.aux2ComboBox.TextChanged += new System.EventHandler(this.aux2ComboBox_TextChanged);
-			this.aux2ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.aux2ComboBox_KeyPress);
-			// 
-			// main2ComboBox
-			// 
-			this.main2ComboBox.FormattingEnabled = true;
-			this.main2ComboBox.Location = new System.Drawing.Point(287, 37);
-			this.main2ComboBox.Name = "main2ComboBox";
-			this.main2ComboBox.Size = new System.Drawing.Size(175, 31);
-			this.main2ComboBox.TabIndex = 9;
-			this.main2ComboBox.Visible = false;
-			this.main2ComboBox.SelectedIndexChanged += new System.EventHandler(this.main2ComboBox_SelectedIndexChanged);
-			this.main2ComboBox.TextChanged += new System.EventHandler(this.main2ComboBox_TextChanged);
-			this.main2ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.main2ComboBox_KeyPress);
-			// 
-			// checkBox2
-			// 
-			this.checkBox2.AutoSize = true;
-			this.checkBox2.Font = new System.Drawing.Font("Verdana", 27.75F);
-			this.checkBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-			this.checkBox2.Location = new System.Drawing.Point(490, 69);
-			this.checkBox2.Name = "checkBox2";
-			this.checkBox2.Size = new System.Drawing.Size(15, 14);
-			this.checkBox2.TabIndex = 8;
-			this.checkBox2.UseVisualStyleBackColor = true;
-			this.checkBox2.Visible = false;
-			// 
-			// auxSN2Label
-			// 
-			this.auxSN2Label.AutoSize = true;
-			this.auxSN2Label.Location = new System.Drawing.Point(21, 86);
-			this.auxSN2Label.Name = "auxSN2Label";
-			this.auxSN2Label.Size = new System.Drawing.Size(193, 23);
-			this.auxSN2Label.TabIndex = 2;
-			this.auxSN2Label.Text = "Aux. WM Serial Nr.";
-			this.auxSN2Label.Visible = false;
-			// 
-			// mainSN2Label
-			// 
-			this.mainSN2Label.AutoSize = true;
-			this.mainSN2Label.Location = new System.Drawing.Point(21, 40);
-			this.mainSN2Label.Name = "mainSN2Label";
-			this.mainSN2Label.Size = new System.Drawing.Size(195, 23);
-			this.mainSN2Label.TabIndex = 0;
-			this.mainSN2Label.Text = "Main WM Serial Nr.";
-			this.mainSN2Label.Visible = false;
-			// 
-			// groupBox3
-			// 
-			this.groupBox3.Controls.Add(this.aux3ComboBox);
-			this.groupBox3.Controls.Add(this.main3ComboBox);
-			this.groupBox3.Controls.Add(this.checkBox3);
-			this.groupBox3.Controls.Add(this.auxSN3Label);
-			this.groupBox3.Controls.Add(this.mainSN3Label);
-			this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.groupBox3.ForeColor = System.Drawing.Color.Black;
-			this.groupBox3.Location = new System.Drawing.Point(28, 430);
-			this.groupBox3.Name = "groupBox3";
-			this.groupBox3.Size = new System.Drawing.Size(533, 137);
-			this.groupBox3.TabIndex = 3;
-			this.groupBox3.TabStop = false;
-			this.groupBox3.Text = "Water Meter 3";
-			this.groupBox3.Visible = false;
-			// 
-			// aux3ComboBox
-			// 
-			this.aux3ComboBox.FormattingEnabled = true;
-			this.aux3ComboBox.Location = new System.Drawing.Point(287, 83);
-			this.aux3ComboBox.Name = "aux3ComboBox";
-			this.aux3ComboBox.Size = new System.Drawing.Size(175, 31);
-			this.aux3ComboBox.TabIndex = 10;
-			this.aux3ComboBox.Visible = false;
-			this.aux3ComboBox.SelectedIndexChanged += new System.EventHandler(this.aux3ComboBox_SelectedIndexChanged);
-			this.aux3ComboBox.TextChanged += new System.EventHandler(this.aux3ComboBox_TextChanged);
-			this.aux3ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.aux3ComboBox_KeyPress);
-			// 
-			// main3ComboBox
-			// 
-			this.main3ComboBox.FormattingEnabled = true;
-			this.main3ComboBox.Location = new System.Drawing.Point(287, 37);
-			this.main3ComboBox.Name = "main3ComboBox";
-			this.main3ComboBox.Size = new System.Drawing.Size(175, 31);
-			this.main3ComboBox.TabIndex = 9;
-			this.main3ComboBox.Visible = false;
-			this.main3ComboBox.SelectedIndexChanged += new System.EventHandler(this.main3ComboBox_SelectedIndexChanged);
-			this.main3ComboBox.TextChanged += new System.EventHandler(this.main3ComboBox_TextChanged);
-			this.main3ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.main3ComboBox_KeyPress);
-			// 
-			// checkBox3
-			// 
-			this.checkBox3.AutoSize = true;
-			this.checkBox3.Font = new System.Drawing.Font("Verdana", 27.75F);
-			this.checkBox3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-			this.checkBox3.Location = new System.Drawing.Point(490, 68);
-			this.checkBox3.Name = "checkBox3";
-			this.checkBox3.Size = new System.Drawing.Size(15, 14);
-			this.checkBox3.TabIndex = 8;
-			this.checkBox3.UseVisualStyleBackColor = true;
-			this.checkBox3.Visible = false;
-			// 
-			// auxSN3Label
-			// 
-			this.auxSN3Label.AutoSize = true;
-			this.auxSN3Label.Location = new System.Drawing.Point(21, 86);
-			this.auxSN3Label.Name = "auxSN3Label";
-			this.auxSN3Label.Size = new System.Drawing.Size(193, 23);
-			this.auxSN3Label.TabIndex = 2;
-			this.auxSN3Label.Text = "Aux. WM Serial Nr.";
-			this.auxSN3Label.Visible = false;
-			// 
-			// mainSN3Label
-			// 
-			this.mainSN3Label.AutoSize = true;
-			this.mainSN3Label.Location = new System.Drawing.Point(21, 40);
-			this.mainSN3Label.Name = "mainSN3Label";
-			this.mainSN3Label.Size = new System.Drawing.Size(195, 23);
-			this.mainSN3Label.TabIndex = 0;
-			this.mainSN3Label.Text = "Main WM Serial Nr.";
-			this.mainSN3Label.Visible = false;
-			// 
-			// clearButton
-			// 
-			this.clearButton.Font = new System.Drawing.Font("Verdana", 14.25F);
-			this.clearButton.ForeColor = System.Drawing.Color.Black;
-			this.clearButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-			this.clearButton.Location = new System.Drawing.Point(589, 116);
-			this.clearButton.Name = "clearButton";
-			this.clearButton.Size = new System.Drawing.Size(117, 63);
-			this.clearButton.TabIndex = 9;
-			this.clearButton.Text = "Clear";
-			this.clearButton.UseVisualStyleBackColor = true;
-			this.clearButton.Click += new System.EventHandler(this.clearButton_Click);
-			// 
-			// orderGroupBox
-			// 
-			this.orderGroupBox.Controls.Add(this.orderComboBox);
-			this.orderGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F);
-			this.orderGroupBox.ForeColor = System.Drawing.Color.Black;
-			this.orderGroupBox.Location = new System.Drawing.Point(28, 16);
-			this.orderGroupBox.Name = "orderGroupBox";
-			this.orderGroupBox.Size = new System.Drawing.Size(533, 82);
-			this.orderGroupBox.TabIndex = 10;
-			this.orderGroupBox.TabStop = false;
-			this.orderGroupBox.Text = "Order";
-			// 
-			// orderComboBox
-			// 
-			this.orderComboBox.FormattingEnabled = true;
-			this.orderComboBox.Location = new System.Drawing.Point(165, 30);
-			this.orderComboBox.Name = "orderComboBox";
-			this.orderComboBox.Size = new System.Drawing.Size(297, 31);
-			this.orderComboBox.TabIndex = 0;
-			// 
-			// CycleBeginningForm
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.AutoSize = true;
-			this.BackColor = System.Drawing.Color.DarkGoldenrod;
-			this.ClientSize = new System.Drawing.Size(732, 593);
-			this.Controls.Add(this.orderGroupBox);
-			this.Controls.Add(this.clearButton);
-			this.Controls.Add(this.groupBox3);
-			this.Controls.Add(this.groupBox2);
-			this.Controls.Add(this.groupBox1);
-			this.Controls.Add(this.okButton);
-			this.ForeColor = System.Drawing.Color.Black;
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Name = "CycleBeginningForm";
-			this.Text = "Daten";
-			this.TopMost = true;
-			this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
-			this.groupBox1.ResumeLayout(false);
-			this.groupBox1.PerformLayout();
-			this.groupBox2.ResumeLayout(false);
-			this.groupBox2.PerformLayout();
-			this.groupBox3.ResumeLayout(false);
-			this.groupBox3.PerformLayout();
-			this.orderGroupBox.ResumeLayout(false);
-			this.ResumeLayout(false);
+            this.okButton = new System.Windows.Forms.Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.aux1ComboBox = new System.Windows.Forms.ComboBox();
+            this.main1ComboBox = new System.Windows.Forms.ComboBox();
+            this.checkBox1 = new System.Windows.Forms.CheckBox();
+            this.auxSN1Label = new System.Windows.Forms.Label();
+            this.mainSN1Label = new System.Windows.Forms.Label();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.aux2ComboBox = new System.Windows.Forms.ComboBox();
+            this.main2ComboBox = new System.Windows.Forms.ComboBox();
+            this.checkBox2 = new System.Windows.Forms.CheckBox();
+            this.auxSN2Label = new System.Windows.Forms.Label();
+            this.mainSN2Label = new System.Windows.Forms.Label();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.aux3ComboBox = new System.Windows.Forms.ComboBox();
+            this.main3ComboBox = new System.Windows.Forms.ComboBox();
+            this.checkBox3 = new System.Windows.Forms.CheckBox();
+            this.auxSN3Label = new System.Windows.Forms.Label();
+            this.mainSN3Label = new System.Windows.Forms.Label();
+            this.clearButton = new System.Windows.Forms.Button();
+            this.orderGroupBox = new System.Windows.Forms.GroupBox();
+            this.orderComboBox = new System.Windows.Forms.ComboBox();
+            this.remarkComboBox1 = new System.Windows.Forms.ComboBox();
+            this.remarkComboBox2 = new System.Windows.Forms.ComboBox();
+            this.remarkComboBox3 = new System.Windows.Forms.ComboBox();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            this.orderGroupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // okButton
+            // 
+            this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.okButton.ForeColor = System.Drawing.Color.Black;
+            this.okButton.Location = new System.Drawing.Point(589, 33);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(117, 63);
+            this.okButton.TabIndex = 0;
+            this.okButton.Text = "OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.remarkComboBox1);
+            this.groupBox1.Controls.Add(this.aux1ComboBox);
+            this.groupBox1.Controls.Add(this.main1ComboBox);
+            this.groupBox1.Controls.Add(this.checkBox1);
+            this.groupBox1.Controls.Add(this.auxSN1Label);
+            this.groupBox1.Controls.Add(this.mainSN1Label);
+            this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.groupBox1.ForeColor = System.Drawing.Color.Black;
+            this.groupBox1.Location = new System.Drawing.Point(28, 118);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(533, 143);
+            this.groupBox1.TabIndex = 1;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Water Meter 1";
+            this.groupBox1.Visible = false;
+            // 
+            // aux1ComboBox
+            // 
+            this.aux1ComboBox.FormattingEnabled = true;
+            this.aux1ComboBox.Location = new System.Drawing.Point(318, 64);
+            this.aux1ComboBox.Name = "aux1ComboBox";
+            this.aux1ComboBox.Size = new System.Drawing.Size(175, 31);
+            this.aux1ComboBox.TabIndex = 6;
+            this.aux1ComboBox.Visible = false;
+            this.aux1ComboBox.SelectedIndexChanged += new System.EventHandler(this.aux1ComboBox_SelectedIndexChanged);
+            this.aux1ComboBox.TextChanged += new System.EventHandler(this.aux1ComboBox_TextChanged);
+            this.aux1ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.aux1ComboBox_KeyPress);
+            // 
+            // main1ComboBox
+            // 
+            this.main1ComboBox.FormattingEnabled = true;
+            this.main1ComboBox.Location = new System.Drawing.Point(318, 27);
+            this.main1ComboBox.Name = "main1ComboBox";
+            this.main1ComboBox.Size = new System.Drawing.Size(175, 31);
+            this.main1ComboBox.TabIndex = 5;
+            this.main1ComboBox.Visible = false;
+            this.main1ComboBox.SelectedIndexChanged += new System.EventHandler(this.main1ComboBox_SelectedIndexChanged);
+            this.main1ComboBox.TextChanged += new System.EventHandler(this.main1ComboBox_TextChanged);
+            this.main1ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.main1ComboBox_KeyPress);
+            // 
+            // checkBox1
+            // 
+            this.checkBox1.AutoSize = true;
+            this.checkBox1.Font = new System.Drawing.Font("Verdana", 27.75F);
+            this.checkBox1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.checkBox1.Location = new System.Drawing.Point(506, 28);
+            this.checkBox1.Name = "checkBox1";
+            this.checkBox1.Size = new System.Drawing.Size(15, 14);
+            this.checkBox1.TabIndex = 4;
+            this.checkBox1.UseVisualStyleBackColor = true;
+            this.checkBox1.Visible = false;
+            // 
+            // auxSN1Label
+            // 
+            this.auxSN1Label.AutoSize = true;
+            this.auxSN1Label.Location = new System.Drawing.Point(21, 67);
+            this.auxSN1Label.Name = "auxSN1Label";
+            this.auxSN1Label.Size = new System.Drawing.Size(193, 23);
+            this.auxSN1Label.TabIndex = 2;
+            this.auxSN1Label.Text = "Aux. WM Serial Nr.";
+            this.auxSN1Label.Visible = false;
+            // 
+            // mainSN1Label
+            // 
+            this.mainSN1Label.AutoSize = true;
+            this.mainSN1Label.Location = new System.Drawing.Point(21, 33);
+            this.mainSN1Label.Name = "mainSN1Label";
+            this.mainSN1Label.Size = new System.Drawing.Size(195, 23);
+            this.mainSN1Label.TabIndex = 0;
+            this.mainSN1Label.Text = "Main WM Serial Nr.";
+            this.mainSN1Label.Visible = false;
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.remarkComboBox2);
+            this.groupBox2.Controls.Add(this.aux2ComboBox);
+            this.groupBox2.Controls.Add(this.main2ComboBox);
+            this.groupBox2.Controls.Add(this.checkBox2);
+            this.groupBox2.Controls.Add(this.auxSN2Label);
+            this.groupBox2.Controls.Add(this.mainSN2Label);
+            this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.groupBox2.ForeColor = System.Drawing.Color.Black;
+            this.groupBox2.Location = new System.Drawing.Point(28, 275);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(533, 143);
+            this.groupBox2.TabIndex = 2;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Water Meter 2";
+            this.groupBox2.Visible = false;
+            // 
+            // aux2ComboBox
+            // 
+            this.aux2ComboBox.FormattingEnabled = true;
+            this.aux2ComboBox.Location = new System.Drawing.Point(318, 64);
+            this.aux2ComboBox.Name = "aux2ComboBox";
+            this.aux2ComboBox.Size = new System.Drawing.Size(175, 31);
+            this.aux2ComboBox.TabIndex = 10;
+            this.aux2ComboBox.Visible = false;
+            this.aux2ComboBox.SelectedIndexChanged += new System.EventHandler(this.aux2ComboBox_SelectedIndexChanged);
+            this.aux2ComboBox.TextChanged += new System.EventHandler(this.aux2ComboBox_TextChanged);
+            this.aux2ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.aux2ComboBox_KeyPress);
+            // 
+            // main2ComboBox
+            // 
+            this.main2ComboBox.FormattingEnabled = true;
+            this.main2ComboBox.Location = new System.Drawing.Point(318, 27);
+            this.main2ComboBox.Name = "main2ComboBox";
+            this.main2ComboBox.Size = new System.Drawing.Size(175, 31);
+            this.main2ComboBox.TabIndex = 9;
+            this.main2ComboBox.Visible = false;
+            this.main2ComboBox.SelectedIndexChanged += new System.EventHandler(this.main2ComboBox_SelectedIndexChanged);
+            this.main2ComboBox.TextChanged += new System.EventHandler(this.main2ComboBox_TextChanged);
+            this.main2ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.main2ComboBox_KeyPress);
+            // 
+            // checkBox2
+            // 
+            this.checkBox2.AutoSize = true;
+            this.checkBox2.Font = new System.Drawing.Font("Verdana", 27.75F);
+            this.checkBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.checkBox2.Location = new System.Drawing.Point(506, 28);
+            this.checkBox2.Name = "checkBox2";
+            this.checkBox2.Size = new System.Drawing.Size(15, 14);
+            this.checkBox2.TabIndex = 8;
+            this.checkBox2.UseVisualStyleBackColor = true;
+            this.checkBox2.Visible = false;
+            // 
+            // auxSN2Label
+            // 
+            this.auxSN2Label.AutoSize = true;
+            this.auxSN2Label.Location = new System.Drawing.Point(21, 67);
+            this.auxSN2Label.Name = "auxSN2Label";
+            this.auxSN2Label.Size = new System.Drawing.Size(193, 23);
+            this.auxSN2Label.TabIndex = 2;
+            this.auxSN2Label.Text = "Aux. WM Serial Nr.";
+            this.auxSN2Label.Visible = false;
+            // 
+            // mainSN2Label
+            // 
+            this.mainSN2Label.AutoSize = true;
+            this.mainSN2Label.Location = new System.Drawing.Point(21, 33);
+            this.mainSN2Label.Name = "mainSN2Label";
+            this.mainSN2Label.Size = new System.Drawing.Size(195, 23);
+            this.mainSN2Label.TabIndex = 0;
+            this.mainSN2Label.Text = "Main WM Serial Nr.";
+            this.mainSN2Label.Visible = false;
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.remarkComboBox3);
+            this.groupBox3.Controls.Add(this.aux3ComboBox);
+            this.groupBox3.Controls.Add(this.main3ComboBox);
+            this.groupBox3.Controls.Add(this.checkBox3);
+            this.groupBox3.Controls.Add(this.auxSN3Label);
+            this.groupBox3.Controls.Add(this.mainSN3Label);
+            this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.groupBox3.ForeColor = System.Drawing.Color.Black;
+            this.groupBox3.Location = new System.Drawing.Point(28, 430);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(533, 143);
+            this.groupBox3.TabIndex = 3;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Water Meter 3";
+            this.groupBox3.Visible = false;
+            // 
+            // aux3ComboBox
+            // 
+            this.aux3ComboBox.FormattingEnabled = true;
+            this.aux3ComboBox.Location = new System.Drawing.Point(318, 64);
+            this.aux3ComboBox.Name = "aux3ComboBox";
+            this.aux3ComboBox.Size = new System.Drawing.Size(175, 31);
+            this.aux3ComboBox.TabIndex = 10;
+            this.aux3ComboBox.Visible = false;
+            this.aux3ComboBox.SelectedIndexChanged += new System.EventHandler(this.aux3ComboBox_SelectedIndexChanged);
+            this.aux3ComboBox.TextChanged += new System.EventHandler(this.aux3ComboBox_TextChanged);
+            this.aux3ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.aux3ComboBox_KeyPress);
+            // 
+            // main3ComboBox
+            // 
+            this.main3ComboBox.FormattingEnabled = true;
+            this.main3ComboBox.Location = new System.Drawing.Point(318, 27);
+            this.main3ComboBox.Name = "main3ComboBox";
+            this.main3ComboBox.Size = new System.Drawing.Size(175, 31);
+            this.main3ComboBox.TabIndex = 9;
+            this.main3ComboBox.Visible = false;
+            this.main3ComboBox.SelectedIndexChanged += new System.EventHandler(this.main3ComboBox_SelectedIndexChanged);
+            this.main3ComboBox.TextChanged += new System.EventHandler(this.main3ComboBox_TextChanged);
+            this.main3ComboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.main3ComboBox_KeyPress);
+            // 
+            // checkBox3
+            // 
+            this.checkBox3.AutoSize = true;
+            this.checkBox3.Font = new System.Drawing.Font("Verdana", 27.75F);
+            this.checkBox3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.checkBox3.Location = new System.Drawing.Point(506, 27);
+            this.checkBox3.Name = "checkBox3";
+            this.checkBox3.Size = new System.Drawing.Size(15, 14);
+            this.checkBox3.TabIndex = 8;
+            this.checkBox3.UseVisualStyleBackColor = true;
+            this.checkBox3.Visible = false;
+            // 
+            // auxSN3Label
+            // 
+            this.auxSN3Label.AutoSize = true;
+            this.auxSN3Label.Location = new System.Drawing.Point(21, 67);
+            this.auxSN3Label.Name = "auxSN3Label";
+            this.auxSN3Label.Size = new System.Drawing.Size(193, 23);
+            this.auxSN3Label.TabIndex = 2;
+            this.auxSN3Label.Text = "Aux. WM Serial Nr.";
+            this.auxSN3Label.Visible = false;
+            // 
+            // mainSN3Label
+            // 
+            this.mainSN3Label.AutoSize = true;
+            this.mainSN3Label.Location = new System.Drawing.Point(21, 33);
+            this.mainSN3Label.Name = "mainSN3Label";
+            this.mainSN3Label.Size = new System.Drawing.Size(195, 23);
+            this.mainSN3Label.TabIndex = 0;
+            this.mainSN3Label.Text = "Main WM Serial Nr.";
+            this.mainSN3Label.Visible = false;
+            // 
+            // clearButton
+            // 
+            this.clearButton.Font = new System.Drawing.Font("Verdana", 14.25F);
+            this.clearButton.ForeColor = System.Drawing.Color.Black;
+            this.clearButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.clearButton.Location = new System.Drawing.Point(589, 116);
+            this.clearButton.Name = "clearButton";
+            this.clearButton.Size = new System.Drawing.Size(117, 63);
+            this.clearButton.TabIndex = 9;
+            this.clearButton.Text = "Clear";
+            this.clearButton.UseVisualStyleBackColor = true;
+            this.clearButton.Click += new System.EventHandler(this.clearButton_Click);
+            // 
+            // orderGroupBox
+            // 
+            this.orderGroupBox.Controls.Add(this.orderComboBox);
+            this.orderGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F);
+            this.orderGroupBox.ForeColor = System.Drawing.Color.Black;
+            this.orderGroupBox.Location = new System.Drawing.Point(28, 16);
+            this.orderGroupBox.Name = "orderGroupBox";
+            this.orderGroupBox.Size = new System.Drawing.Size(533, 82);
+            this.orderGroupBox.TabIndex = 10;
+            this.orderGroupBox.TabStop = false;
+            this.orderGroupBox.Text = "Order";
+            // 
+            // orderComboBox
+            // 
+            this.orderComboBox.FormattingEnabled = true;
+            this.orderComboBox.Location = new System.Drawing.Point(196, 31);
+            this.orderComboBox.Name = "orderComboBox";
+            this.orderComboBox.Size = new System.Drawing.Size(297, 31);
+            this.orderComboBox.TabIndex = 0;
+            // 
+            // remarkComboBox1
+            // 
+            this.remarkComboBox1.Font = new System.Drawing.Font("Verdana", 14.25F);
+            this.remarkComboBox1.FormattingEnabled = true;
+            this.remarkComboBox1.Location = new System.Drawing.Point(56, 101);
+            this.remarkComboBox1.Name = "remarkComboBox1";
+            this.remarkComboBox1.Size = new System.Drawing.Size(437, 31);
+            this.remarkComboBox1.TabIndex = 35;
+            this.remarkComboBox1.Visible = false;
+            // 
+            // remarkComboBox2
+            // 
+            this.remarkComboBox2.Font = new System.Drawing.Font("Verdana", 14.25F);
+            this.remarkComboBox2.FormattingEnabled = true;
+            this.remarkComboBox2.Location = new System.Drawing.Point(56, 101);
+            this.remarkComboBox2.Name = "remarkComboBox2";
+            this.remarkComboBox2.Size = new System.Drawing.Size(437, 31);
+            this.remarkComboBox2.TabIndex = 36;
+            this.remarkComboBox2.Visible = false;
+            // 
+            // remarkComboBox3
+            // 
+            this.remarkComboBox3.Font = new System.Drawing.Font("Verdana", 14.25F);
+            this.remarkComboBox3.FormattingEnabled = true;
+            this.remarkComboBox3.Location = new System.Drawing.Point(56, 101);
+            this.remarkComboBox3.Name = "remarkComboBox3";
+            this.remarkComboBox3.Size = new System.Drawing.Size(437, 31);
+            this.remarkComboBox3.TabIndex = 37;
+            this.remarkComboBox3.Visible = false;
+            // 
+            // CycleBeginningForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoSize = true;
+            this.BackColor = System.Drawing.Color.DarkGoldenrod;
+            this.ClientSize = new System.Drawing.Size(732, 593);
+            this.Controls.Add(this.orderGroupBox);
+            this.Controls.Add(this.clearButton);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.okButton);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.Name = "CycleBeginningForm";
+            this.Text = "Daten";
+            this.TopMost = true;
+            this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.orderGroupBox.ResumeLayout(false);
+            this.ResumeLayout(false);
 
         }
 
@@ -377,5 +413,8 @@ namespace TBF.BenchControl.DataEntry.Combined
 		private System.Windows.Forms.ComboBox main2ComboBox;
 		private System.Windows.Forms.ComboBox aux3ComboBox;
 		private System.Windows.Forms.ComboBox main3ComboBox;
+        private System.Windows.Forms.ComboBox remarkComboBox1;
+        private System.Windows.Forms.ComboBox remarkComboBox2;
+        private System.Windows.Forms.ComboBox remarkComboBox3;
     }
 }

TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.cs

@@ -17,12 +17,14 @@ namespace TBF.BenchControl.DataEntry.Combined
 
 		/// <summary> Number of water meters </summary>
 		public readonly int WaterMetersCount;
+        public readonly bool RemarksEnabled;
 
 		// To be retrieved after the form closes
 		public string PurchaseOrder;
 		public string[] MainSNText;
 		public string[] AuxSNText;
 		public bool[] Disabled;
+        public string[] Remark;
 
 		// Set to 'true' when the form closes
         public bool Completed { get { return completed; } }
@@ -35,44 +37,52 @@ namespace TBF.BenchControl.DataEntry.Combined
 		ComboBox[] mainComboBoxes;
 		ComboBox[] auxComboBoxes;
 		CheckBox[] checkBoxes;
-		IList<ComboBox> enabledComboBoxes;
-
+        ComboBox[] remarkBoxes;
+        IList<ComboBox> enabledComboBoxes;
 
+        /// <summary>
+        /// Default constructor - Default number of compound water meters
+        /// </summary>
 		public CycleBeginningForm()
+            : this (Config.Data.CompoundWMsCount, false)
         {
-            InitializeComponent();
-			ControlBox = false;
-
-			TextBoxesCount = 3;
-			mainLabels = new Label[] { mainSN1Label,  mainSN2Label,  mainSN3Label };
-			auxLabels = new Label[] { auxSN1Label, auxSN2Label, auxSN3Label };
-			mainComboBoxes = new ComboBox[] { main1ComboBox,  main2ComboBox,  main3ComboBox };
-			auxComboBoxes = new ComboBox[] { aux1ComboBox, aux2ComboBox, aux3ComboBox };
-			checkBoxes = new CheckBox[] { checkBox1,  checkBox2,  checkBox3 };
-			enabledComboBoxes = new List<ComboBox>();
-
-			this.WaterMetersCount = Config.Data.CompoundWMsCount;		/// Default number of compound water meters
-
-			completed = false;
-			StartForceCloseHandler();
+			this.WaterMetersCount = Config.Data.CompoundWMsCount;		
 		}
 
 		/// <summary>
 		/// Constructor
 		/// </summary>
 		/// <param name="compoundWaterMetersCount">Number of text boxes for serial numbers</param>
-		public CycleBeginningForm(int compoundWaterMetersCount)
-			: this()
+        /// <param name="remarksEnabled">Enable </param>
+        public CycleBeginningForm(int compoundWaterMetersCount, bool remarksEnabled)
 		{
-			this.WaterMetersCount = compoundWaterMetersCount;	/// = Program.CompondWMsCount
-			MainSNText = new string[compoundWaterMetersCount];
-			AuxSNText = new string[compoundWaterMetersCount];
-			Disabled = new bool[compoundWaterMetersCount];
+            InitializeComponent();
+            ControlBox = false;
+
+            TextBoxesCount = 3;
+            mainLabels = new Label[] { mainSN1Label, mainSN2Label, mainSN3Label };
+            auxLabels = new Label[] { auxSN1Label, auxSN2Label, auxSN3Label };
+            mainComboBoxes = new ComboBox[] { main1ComboBox, main2ComboBox, main3ComboBox };
+            auxComboBoxes = new ComboBox[] { aux1ComboBox, aux2ComboBox, aux3ComboBox };
+            checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3 };
+            remarkBoxes = new ComboBox[] { remarkComboBox1, remarkComboBox2, remarkComboBox3 };
+
+            this.WaterMetersCount = compoundWaterMetersCount;	/// = Program.CompondWMsCount
+            this.RemarksEnabled = remarksEnabled;
+
+            MainSNText = new string[compoundWaterMetersCount];
+            AuxSNText = new string[compoundWaterMetersCount];
+            Disabled = new bool[compoundWaterMetersCount];
+            Remark = new string[compoundWaterMetersCount];
+            enabledComboBoxes = new List<ComboBox>();
 
 			ShuffleTextBoxes(compoundWaterMetersCount);
 
-			Height = 110 + WaterMetersCount * 157;
-		}
+			Height = 115 + WaterMetersCount * 157;
+
+            completed = false;
+            StartForceCloseHandler();
+        }
 
 		/// <summary>
 		/// Make sure the layout of labels/text boxes on the screen
@@ -88,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 		{
 			Localize();
 
-			PrepareOrderCombo(orderComboBox);
+            DEUtils.PrepareCombo(orderComboBox, Program.LocalSettings.PurchaseOrderHistory);
 
 			if (WaterMetersCount >= 1) groupBox1.Visible = true;
 			if (WaterMetersCount >= 2) groupBox2.Visible = true;
@@ -99,6 +109,11 @@ namespace TBF.BenchControl.DataEntry.Combined
 				mainLabels[i].Visible = mainComboBoxes[i].Visible = true;
 				auxLabels[i].Visible = auxComboBoxes[i].Visible = true;
 				checkBoxes[i].Visible = true;
+                if (RemarksEnabled)
+                {
+                    DEUtils.PrepareCombo(remarkBoxes[i], Program.LocalSettings.RemarkHistory, true);
+                    remarkBoxes[i].Visible = true;
+                }
 				enabledComboBoxes.Add(mainComboBoxes[i]);
 				enabledComboBoxes.Add(auxComboBoxes[i]);
 
@@ -128,23 +143,6 @@ namespace TBF.BenchControl.DataEntry.Combined
 			clearButton.Text = Strings.ClearBtnText;
 		}
 
-		/// <summary>
-		/// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
-		/// </summary>
-		/// <param name="orderComboBox">Puchase order ComboBox</param>
-		void PrepareOrderCombo(ComboBox orderComboBox)
-		{
-			for (int i = 0; i < Program.LocalSettings.PurchaseOrderHistoryCount; i++)
-			{
-				orderComboBox.Items.Add(Program.LocalSettings.PurchaseOrderHistory[i]);
-			}
-
-			if (orderComboBox.Items.Count > 0)
-			{
-				orderComboBox.Text = orderComboBox.Items[0].ToString();
-			}
-		}
-
         private void okButton_Click(object sender, EventArgs e)
         {
 			PurchaseOrder = orderComboBox.Text;
@@ -160,10 +158,15 @@ namespace TBF.BenchControl.DataEntry.Combined
 
 			for (int i = 0; i < TextBoxesCount; i++)
 			{
-				MainSNText[i] = mainComboBoxes[i].Text;
+                if (RemarksEnabled)
+                {
+                    Program.LocalSettings.UpdateHistory(remarkBoxes[i].Text, ref Program.LocalSettings.RemarkHistory, 20);
+                }
+                MainSNText[i] = mainComboBoxes[i].Text;
 				AuxSNText[i] = auxComboBoxes[i].Text;
 				Disabled[i] = !checkBoxes[i].Checked;
-			}
+                Remark[i] = remarkBoxes[i].Text;
+            }
 
             completed = true;
             Close();
@@ -280,12 +283,14 @@ namespace TBF.BenchControl.DataEntry.Combined
 		/// <param name="currentFocusOwner">TextBox control which received the event</param>
 		private void ProcKeyPress(object sender, KeyPressEventArgs e, ComboBox currentFocusOwner)
 		{
+#if !CEVAK_200
 			if (e.KeyChar == '+')
 			{
 				/// Process '+' key ..... Form completed
 				okButton_Click(sender, e);
 			}
-			if (e.KeyChar == '\r')
+#endif
+            if (e.KeyChar == '\r')
 			{
 				/// Process <enter> key ..... Next text field
 				if (enabledComboBoxes.Count < 2) return;		/// There is just one enabled textbox

TBF/BenchControl/DataEntry/Combined/EntryForm.cs

@@ -124,7 +124,7 @@ namespace TBF.BenchControl.DataEntry.Combined
         /// 
         void OpenBeginningDlg(EntryForm myRef)
         {
-			myRef.modelessDlg = new CycleBeginningForm(Config.Data.CompoundWMsCount);
+            myRef.modelessDlg = new CycleBeginningForm(Config.Data.CompoundWMsCount, myRef.entryFormCfg.RemarkEnabled);
             modelessDlg.Show();
         }
         /// 
@@ -203,9 +203,12 @@ namespace TBF.BenchControl.DataEntry.Combined
 							{
 								waterMeters[i].SerialNr = dlg.MainSNText[i];
 								waterMeters[i].SerialNrAux = dlg.AuxSNText[i];
-
 								disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
-							}
+                                if (dlg.RemarksEnabled)
+                                {
+                                    waterMeters[i].Remark = dlg.Remark[i];
+                                }
+                            }
 						}
 					}
 				}

TBF/BenchControl/DataEntry/Combined/EntryFormCfg.cs

@@ -20,6 +20,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 		/// Serialized parameters 
 		///
 		public bool ShowCycleEndForm;
+        public bool RemarkEnabled;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		EntryFormCfg()
@@ -27,7 +28,8 @@ namespace TBF.BenchControl.DataEntry.Combined
 			Name = "DataEntry-Combined";
             ParentName = string.Empty;
 			ShowCycleEndForm = false;
-		}
+            RemarkEnabled = false;
+        }
 
         public EntryFormCfg(IComponentFactory factory)
             : this()
@@ -37,7 +39,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 
 		public string ToString(int i)
 		{
-			return string.Format("Name={0}, ShowEndForm={1}", Name, ShowCycleEndForm);
+            return string.Format("Name={0}, ShowEndForm={1}, Remark={2}", Name, ShowCycleEndForm, RemarkEnabled);
 		}
 	}
 }

TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.cs

@@ -38,7 +38,8 @@ namespace TBF.BenchControl.DataEntry.Combined
 		void Localize()
 		{
 			showCycleEndFormCheckBox.Text = Strings.Show_cycle_end_form;
-		}
+            remarkEnabledCheckBox.Text = Strings.Enable_Remark;
+        }
 
 		public void Closing()
 		{
@@ -50,13 +51,15 @@ namespace TBF.BenchControl.DataEntry.Combined
 			classNameLabel.Text = config.Factory.ClassName;
 			nameTextBox.Text = config.Name;
 			showCycleEndFormCheckBox.Checked = config.ShowCycleEndForm;
-		}
+            remarkEnabledCheckBox.Checked = config.RemarkEnabled;
+        }
 
 		public void Unlock()
 		{
 			nameTextBox.Enabled = true;
 			showCycleEndFormCheckBox.Enabled = true;
-		}
+            remarkEnabledCheckBox.Enabled = true;
+        }
 
 		public CfgUpdateFlags VerifyCfg(ref string message)
 		{
@@ -72,6 +75,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 
 			config.Name = nameTextBox.Text;
 			config.ShowCycleEndForm = showCycleEndFormCheckBox.Checked;
+            config.RemarkEnabled = remarkEnabledCheckBox.Checked;
 
 			return flags;
 		}

TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.designer.cs

@@ -31,62 +31,75 @@ namespace TBF.BenchControl.DataEntry.Combined
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.nameTextBox = new System.Windows.Forms.TextBox();
-			this.nameLabel = new System.Windows.Forms.Label();
-			this.classNameLabel = new System.Windows.Forms.Label();
-			this.showCycleEndFormCheckBox = new System.Windows.Forms.CheckBox();
-			this.SuspendLayout();
-			// 
-			// nameTextBox
-			// 
-			this.nameTextBox.Enabled = false;
-			this.nameTextBox.Location = new System.Drawing.Point(137, 57);
-			this.nameTextBox.Name = "nameTextBox";
-			this.nameTextBox.Size = new System.Drawing.Size(130, 20);
-			this.nameTextBox.TabIndex = 5;
-			// 
-			// nameLabel
-			// 
-			this.nameLabel.AutoSize = true;
-			this.nameLabel.Location = new System.Drawing.Point(27, 60);
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Size = new System.Drawing.Size(35, 13);
-			this.nameLabel.TabIndex = 4;
-			this.nameLabel.Text = "Name";
-			// 
-			// classNameLabel
-			// 
-			this.classNameLabel.AutoSize = true;
-			this.classNameLabel.Location = new System.Drawing.Point(134, 33);
-			this.classNameLabel.Name = "classNameLabel";
-			this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-			this.classNameLabel.TabIndex = 3;
-			this.classNameLabel.Text = "ComonentName";
-			// 
-			// showCycleEndFormCheckBox
-			// 
-			this.showCycleEndFormCheckBox.AutoSize = true;
-			this.showCycleEndFormCheckBox.Enabled = false;
-			this.showCycleEndFormCheckBox.Location = new System.Drawing.Point(137, 90);
-			this.showCycleEndFormCheckBox.Name = "showCycleEndFormCheckBox";
-			this.showCycleEndFormCheckBox.Size = new System.Drawing.Size(125, 17);
-			this.showCycleEndFormCheckBox.TabIndex = 14;
-			this.showCycleEndFormCheckBox.Text = "Show cycle end form";
-			this.showCycleEndFormCheckBox.UseVisualStyleBackColor = true;
-			// 
-			// EntryFormCfgCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.showCycleEndFormCheckBox);
-			this.Controls.Add(this.nameTextBox);
-			this.Controls.Add(this.nameLabel);
-			this.Controls.Add(this.classNameLabel);
-			this.Name = "EntryFormCfgCtrl";
-			this.Size = new System.Drawing.Size(300, 200);
-			this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.nameTextBox = new System.Windows.Forms.TextBox();
+            this.nameLabel = new System.Windows.Forms.Label();
+            this.classNameLabel = new System.Windows.Forms.Label();
+            this.showCycleEndFormCheckBox = new System.Windows.Forms.CheckBox();
+            this.remarkEnabledCheckBox = new System.Windows.Forms.CheckBox();
+            this.SuspendLayout();
+            // 
+            // nameTextBox
+            // 
+            this.nameTextBox.Enabled = false;
+            this.nameTextBox.Location = new System.Drawing.Point(114, 57);
+            this.nameTextBox.Name = "nameTextBox";
+            this.nameTextBox.Size = new System.Drawing.Size(130, 20);
+            this.nameTextBox.TabIndex = 5;
+            // 
+            // nameLabel
+            // 
+            this.nameLabel.AutoSize = true;
+            this.nameLabel.Location = new System.Drawing.Point(39, 60);
+            this.nameLabel.Name = "nameLabel";
+            this.nameLabel.Size = new System.Drawing.Size(35, 13);
+            this.nameLabel.TabIndex = 4;
+            this.nameLabel.Text = "Name";
+            // 
+            // classNameLabel
+            // 
+            this.classNameLabel.AutoSize = true;
+            this.classNameLabel.Location = new System.Drawing.Point(111, 33);
+            this.classNameLabel.Name = "classNameLabel";
+            this.classNameLabel.Size = new System.Drawing.Size(83, 13);
+            this.classNameLabel.TabIndex = 3;
+            this.classNameLabel.Text = "ComonentName";
+            // 
+            // showCycleEndFormCheckBox
+            // 
+            this.showCycleEndFormCheckBox.AutoSize = true;
+            this.showCycleEndFormCheckBox.Enabled = false;
+            this.showCycleEndFormCheckBox.Location = new System.Drawing.Point(114, 90);
+            this.showCycleEndFormCheckBox.Name = "showCycleEndFormCheckBox";
+            this.showCycleEndFormCheckBox.Size = new System.Drawing.Size(125, 17);
+            this.showCycleEndFormCheckBox.TabIndex = 14;
+            this.showCycleEndFormCheckBox.Text = "Show cycle end form";
+            this.showCycleEndFormCheckBox.UseVisualStyleBackColor = true;
+            // 
+            // remarkEnabledCheckBox
+            // 
+            this.remarkEnabledCheckBox.AutoSize = true;
+            this.remarkEnabledCheckBox.Enabled = false;
+            this.remarkEnabledCheckBox.Location = new System.Drawing.Point(114, 113);
+            this.remarkEnabledCheckBox.Name = "remarkEnabledCheckBox";
+            this.remarkEnabledCheckBox.Size = new System.Drawing.Size(99, 17);
+            this.remarkEnabledCheckBox.TabIndex = 15;
+            this.remarkEnabledCheckBox.Text = "Enable remarks";
+            this.remarkEnabledCheckBox.UseVisualStyleBackColor = true;
+            // 
+            // EntryFormCfgCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.remarkEnabledCheckBox);
+            this.Controls.Add(this.showCycleEndFormCheckBox);
+            this.Controls.Add(this.nameTextBox);
+            this.Controls.Add(this.nameLabel);
+            this.Controls.Add(this.classNameLabel);
+            this.Name = "EntryFormCfgCtrl";
+            this.Size = new System.Drawing.Size(300, 200);
+            this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -96,5 +109,6 @@ namespace TBF.BenchControl.DataEntry.Combined
 		private System.Windows.Forms.Label nameLabel;
 		private System.Windows.Forms.Label classNameLabel;
 		private System.Windows.Forms.CheckBox showCycleEndFormCheckBox;
+        private System.Windows.Forms.CheckBox remarkEnabledCheckBox;
 	}
 }

TBF/BenchControl/DataEntry/DEUtils.cs

@@ -0,0 +1,34 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Windows.Forms;
+
+namespace TBF.BenchControl.DataEntry
+{
+    public class DEUtils
+    {
+        /// <summary>
+        /// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
+        /// </summary>
+        /// <param name="comboBox">Puchase order ComboBox</param>
+        public static void PrepareCombo(ComboBox comboBox, string[] history, bool emptyOnStart = false)
+        {
+            int historyLen = (history != null) ? history.Length : 0;
+
+            if (!emptyOnStart && (historyLen > 0))
+            {
+                comboBox.Text = history[0];
+            }
+            else
+            {
+                comboBox.Text = string.Empty;
+            }
+
+            for (int i = 0; i < historyLen; i++)
+            {
+                comboBox.Items.Add(history[i]);
+            }
+        }
+    }
+}

TBF/BenchControl/DataEntry/Single/CycleBeginningForm.Designer.cs

@@ -0,0 +1,794 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+namespace TBF.BenchControl.DataEntry.Single
+{
+    partial class CycleBeginningForm
+    {
+        /// <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()
+        {
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm));
+			this.okButton = new System.Windows.Forms.Button();
+			this.orderGroupBox = new System.Windows.Forms.GroupBox();
+			this.orderComboBox = new System.Windows.Forms.ComboBox();
+			this.clearButton = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.comboBox1 = new System.Windows.Forms.ComboBox();
+			this.checkBox1 = new System.Windows.Forms.CheckBox();
+			this.checkBox2 = new System.Windows.Forms.CheckBox();
+			this.comboBox2 = new System.Windows.Forms.ComboBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.checkBox3 = new System.Windows.Forms.CheckBox();
+			this.comboBox3 = new System.Windows.Forms.ComboBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.checkBox4 = new System.Windows.Forms.CheckBox();
+			this.comboBox4 = new System.Windows.Forms.ComboBox();
+			this.label4 = new System.Windows.Forms.Label();
+			this.checkBox5 = new System.Windows.Forms.CheckBox();
+			this.comboBox5 = new System.Windows.Forms.ComboBox();
+			this.label5 = new System.Windows.Forms.Label();
+			this.checkBox6 = new System.Windows.Forms.CheckBox();
+			this.comboBox6 = new System.Windows.Forms.ComboBox();
+			this.label6 = new System.Windows.Forms.Label();
+			this.checkBox7 = new System.Windows.Forms.CheckBox();
+			this.comboBox7 = new System.Windows.Forms.ComboBox();
+			this.label7 = new System.Windows.Forms.Label();
+			this.checkBox8 = new System.Windows.Forms.CheckBox();
+			this.comboBox8 = new System.Windows.Forms.ComboBox();
+			this.label8 = new System.Windows.Forms.Label();
+			this.checkBox9 = new System.Windows.Forms.CheckBox();
+			this.comboBox9 = new System.Windows.Forms.ComboBox();
+			this.label9 = new System.Windows.Forms.Label();
+			this.checkBox10 = new System.Windows.Forms.CheckBox();
+			this.comboBox10 = new System.Windows.Forms.ComboBox();
+			this.label10 = new System.Windows.Forms.Label();
+			this.checkBox11 = new System.Windows.Forms.CheckBox();
+			this.comboBox11 = new System.Windows.Forms.ComboBox();
+			this.label11 = new System.Windows.Forms.Label();
+			this.checkBox12 = new System.Windows.Forms.CheckBox();
+			this.comboBox12 = new System.Windows.Forms.ComboBox();
+			this.label12 = new System.Windows.Forms.Label();
+			this.checkBox13 = new System.Windows.Forms.CheckBox();
+			this.comboBox13 = new System.Windows.Forms.ComboBox();
+			this.label13 = new System.Windows.Forms.Label();
+			this.checkBox14 = new System.Windows.Forms.CheckBox();
+			this.comboBox14 = new System.Windows.Forms.ComboBox();
+			this.label14 = new System.Windows.Forms.Label();
+			this.checkBox15 = new System.Windows.Forms.CheckBox();
+			this.comboBox15 = new System.Windows.Forms.ComboBox();
+			this.label15 = new System.Windows.Forms.Label();
+			this.checkBox16 = new System.Windows.Forms.CheckBox();
+			this.comboBox16 = new System.Windows.Forms.ComboBox();
+			this.label16 = new System.Windows.Forms.Label();
+			this.checkBox17 = new System.Windows.Forms.CheckBox();
+			this.comboBox17 = new System.Windows.Forms.ComboBox();
+			this.label17 = new System.Windows.Forms.Label();
+			this.checkBox18 = new System.Windows.Forms.CheckBox();
+			this.comboBox18 = new System.Windows.Forms.ComboBox();
+			this.label18 = new System.Windows.Forms.Label();
+			this.checkBox19 = new System.Windows.Forms.CheckBox();
+			this.comboBox19 = new System.Windows.Forms.ComboBox();
+			this.label19 = new System.Windows.Forms.Label();
+			this.checkBox20 = new System.Windows.Forms.CheckBox();
+			this.comboBox20 = new System.Windows.Forms.ComboBox();
+			this.label20 = new System.Windows.Forms.Label();
+			this.checkBox21 = new System.Windows.Forms.CheckBox();
+			this.comboBox21 = new System.Windows.Forms.ComboBox();
+			this.label21 = new System.Windows.Forms.Label();
+			this.checkBox22 = new System.Windows.Forms.CheckBox();
+			this.comboBox22 = new System.Windows.Forms.ComboBox();
+			this.label22 = new System.Windows.Forms.Label();
+			this.checkBox23 = new System.Windows.Forms.CheckBox();
+			this.comboBox23 = new System.Windows.Forms.ComboBox();
+			this.label23 = new System.Windows.Forms.Label();
+			this.checkBox24 = new System.Windows.Forms.CheckBox();
+			this.comboBox24 = new System.Windows.Forms.ComboBox();
+			this.label24 = new System.Windows.Forms.Label();
+			this.orderGroupBox.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// okButton
+			// 
+			resources.ApplyResources(this.okButton, "okButton");
+			this.okButton.ForeColor = System.Drawing.Color.Black;
+			this.okButton.Name = "okButton";
+			this.okButton.UseVisualStyleBackColor = true;
+			this.okButton.Click += new System.EventHandler(this.okButton_Click);
+			// 
+			// orderGroupBox
+			// 
+			this.orderGroupBox.Controls.Add(this.orderComboBox);
+			resources.ApplyResources(this.orderGroupBox, "orderGroupBox");
+			this.orderGroupBox.ForeColor = System.Drawing.Color.Black;
+			this.orderGroupBox.Name = "orderGroupBox";
+			this.orderGroupBox.TabStop = false;
+			// 
+			// orderComboBox
+			// 
+			this.orderComboBox.FormattingEnabled = true;
+			resources.ApplyResources(this.orderComboBox, "orderComboBox");
+			this.orderComboBox.Name = "orderComboBox";
+			// 
+			// clearButton
+			// 
+			resources.ApplyResources(this.clearButton, "clearButton");
+			this.clearButton.ForeColor = System.Drawing.Color.Black;
+			this.clearButton.Name = "clearButton";
+			this.clearButton.UseVisualStyleBackColor = true;
+			this.clearButton.Click += new System.EventHandler(this.clearButton_Click);
+			// 
+			// label1
+			// 
+			resources.ApplyResources(this.label1, "label1");
+			this.label1.Name = "label1";
+			// 
+			// comboBox1
+			// 
+			resources.ApplyResources(this.comboBox1, "comboBox1");
+			this.comboBox1.FormattingEnabled = true;
+			this.comboBox1.Name = "comboBox1";
+			this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+			this.comboBox1.TextChanged += new System.EventHandler(this.comboBox1_TextChanged);
+			this.comboBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox1_KeyPress);
+			// 
+			// checkBox1
+			// 
+			resources.ApplyResources(this.checkBox1, "checkBox1");
+			this.checkBox1.Name = "checkBox1";
+			this.checkBox1.UseVisualStyleBackColor = true;
+			// 
+			// checkBox2
+			// 
+			resources.ApplyResources(this.checkBox2, "checkBox2");
+			this.checkBox2.Name = "checkBox2";
+			this.checkBox2.UseVisualStyleBackColor = true;
+			// 
+			// comboBox2
+			// 
+			resources.ApplyResources(this.comboBox2, "comboBox2");
+			this.comboBox2.FormattingEnabled = true;
+			this.comboBox2.Name = "comboBox2";
+			this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
+			this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
+			this.comboBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox2_KeyPress);
+			// 
+			// label2
+			// 
+			resources.ApplyResources(this.label2, "label2");
+			this.label2.Name = "label2";
+			// 
+			// checkBox3
+			// 
+			resources.ApplyResources(this.checkBox3, "checkBox3");
+			this.checkBox3.Name = "checkBox3";
+			this.checkBox3.UseVisualStyleBackColor = true;
+			// 
+			// comboBox3
+			// 
+			resources.ApplyResources(this.comboBox3, "comboBox3");
+			this.comboBox3.FormattingEnabled = true;
+			this.comboBox3.Name = "comboBox3";
+			this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged);
+			this.comboBox3.TextChanged += new System.EventHandler(this.comboBox3_TextChanged);
+			this.comboBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox3_KeyPress);
+			// 
+			// label3
+			// 
+			resources.ApplyResources(this.label3, "label3");
+			this.label3.Name = "label3";
+			// 
+			// checkBox4
+			// 
+			resources.ApplyResources(this.checkBox4, "checkBox4");
+			this.checkBox4.Name = "checkBox4";
+			this.checkBox4.UseVisualStyleBackColor = true;
+			// 
+			// comboBox4
+			// 
+			resources.ApplyResources(this.comboBox4, "comboBox4");
+			this.comboBox4.FormattingEnabled = true;
+			this.comboBox4.Name = "comboBox4";
+			this.comboBox4.SelectedIndexChanged += new System.EventHandler(this.comboBox4_SelectedIndexChanged);
+			this.comboBox4.TextChanged += new System.EventHandler(this.comboBox4_TextChanged);
+			this.comboBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox4_KeyPress);
+			// 
+			// label4
+			// 
+			resources.ApplyResources(this.label4, "label4");
+			this.label4.Name = "label4";
+			// 
+			// checkBox5
+			// 
+			resources.ApplyResources(this.checkBox5, "checkBox5");
+			this.checkBox5.Name = "checkBox5";
+			this.checkBox5.UseVisualStyleBackColor = true;
+			// 
+			// comboBox5
+			// 
+			resources.ApplyResources(this.comboBox5, "comboBox5");
+			this.comboBox5.FormattingEnabled = true;
+			this.comboBox5.Name = "comboBox5";
+			this.comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox5_SelectedIndexChanged);
+			this.comboBox5.TextChanged += new System.EventHandler(this.comboBox5_TextChanged);
+			this.comboBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox5_KeyPress);
+			// 
+			// label5
+			// 
+			resources.ApplyResources(this.label5, "label5");
+			this.label5.Name = "label5";
+			// 
+			// checkBox6
+			// 
+			resources.ApplyResources(this.checkBox6, "checkBox6");
+			this.checkBox6.Name = "checkBox6";
+			this.checkBox6.UseVisualStyleBackColor = true;
+			// 
+			// comboBox6
+			// 
+			resources.ApplyResources(this.comboBox6, "comboBox6");
+			this.comboBox6.FormattingEnabled = true;
+			this.comboBox6.Name = "comboBox6";
+			this.comboBox6.SelectedIndexChanged += new System.EventHandler(this.comboBox6_SelectedIndexChanged);
+			this.comboBox6.TextChanged += new System.EventHandler(this.comboBox6_TextChanged);
+			this.comboBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox6_KeyPress);
+			// 
+			// label6
+			// 
+			resources.ApplyResources(this.label6, "label6");
+			this.label6.Name = "label6";
+			// 
+			// checkBox7
+			// 
+			resources.ApplyResources(this.checkBox7, "checkBox7");
+			this.checkBox7.Name = "checkBox7";
+			this.checkBox7.UseVisualStyleBackColor = true;
+			// 
+			// comboBox7
+			// 
+			resources.ApplyResources(this.comboBox7, "comboBox7");
+			this.comboBox7.FormattingEnabled = true;
+			this.comboBox7.Name = "comboBox7";
+			this.comboBox7.SelectedIndexChanged += new System.EventHandler(this.comboBox7_SelectedIndexChanged);
+			this.comboBox7.TextChanged += new System.EventHandler(this.comboBox7_TextChanged);
+			this.comboBox7.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox7_KeyPress);
+			// 
+			// label7
+			// 
+			resources.ApplyResources(this.label7, "label7");
+			this.label7.Name = "label7";
+			// 
+			// checkBox8
+			// 
+			resources.ApplyResources(this.checkBox8, "checkBox8");
+			this.checkBox8.Name = "checkBox8";
+			this.checkBox8.UseVisualStyleBackColor = true;
+			// 
+			// comboBox8
+			// 
+			resources.ApplyResources(this.comboBox8, "comboBox8");
+			this.comboBox8.FormattingEnabled = true;
+			this.comboBox8.Name = "comboBox8";
+			this.comboBox8.SelectedIndexChanged += new System.EventHandler(this.comboBox8_SelectedIndexChanged);
+			this.comboBox8.TextChanged += new System.EventHandler(this.comboBox8_TextChanged);
+			this.comboBox8.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox8_KeyPress);
+			// 
+			// label8
+			// 
+			resources.ApplyResources(this.label8, "label8");
+			this.label8.Name = "label8";
+			// 
+			// checkBox9
+			// 
+			resources.ApplyResources(this.checkBox9, "checkBox9");
+			this.checkBox9.Name = "checkBox9";
+			this.checkBox9.UseVisualStyleBackColor = true;
+			// 
+			// comboBox9
+			// 
+			resources.ApplyResources(this.comboBox9, "comboBox9");
+			this.comboBox9.FormattingEnabled = true;
+			this.comboBox9.Name = "comboBox9";
+			this.comboBox9.SelectedIndexChanged += new System.EventHandler(this.comboBox9_SelectedIndexChanged);
+			this.comboBox9.TextChanged += new System.EventHandler(this.comboBox9_TextChanged);
+			this.comboBox9.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox9_KeyPress);
+			// 
+			// label9
+			// 
+			resources.ApplyResources(this.label9, "label9");
+			this.label9.Name = "label9";
+			// 
+			// checkBox10
+			// 
+			resources.ApplyResources(this.checkBox10, "checkBox10");
+			this.checkBox10.Name = "checkBox10";
+			this.checkBox10.UseVisualStyleBackColor = true;
+			// 
+			// comboBox10
+			// 
+			resources.ApplyResources(this.comboBox10, "comboBox10");
+			this.comboBox10.FormattingEnabled = true;
+			this.comboBox10.Name = "comboBox10";
+			this.comboBox10.SelectedIndexChanged += new System.EventHandler(this.comboBox10_SelectedIndexChanged);
+			this.comboBox10.TextChanged += new System.EventHandler(this.comboBox10_TextChanged);
+			this.comboBox10.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox10_KeyPress);
+			// 
+			// label10
+			// 
+			resources.ApplyResources(this.label10, "label10");
+			this.label10.Name = "label10";
+			// 
+			// checkBox11
+			// 
+			resources.ApplyResources(this.checkBox11, "checkBox11");
+			this.checkBox11.Name = "checkBox11";
+			this.checkBox11.UseVisualStyleBackColor = true;
+			// 
+			// comboBox11
+			// 
+			resources.ApplyResources(this.comboBox11, "comboBox11");
+			this.comboBox11.FormattingEnabled = true;
+			this.comboBox11.Name = "comboBox11";
+			this.comboBox11.SelectedIndexChanged += new System.EventHandler(this.comboBox11_SelectedIndexChanged);
+			this.comboBox11.TextChanged += new System.EventHandler(this.comboBox11_TextChanged);
+			this.comboBox11.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox11_KeyPress);
+			// 
+			// label11
+			// 
+			resources.ApplyResources(this.label11, "label11");
+			this.label11.Name = "label11";
+			// 
+			// checkBox12
+			// 
+			resources.ApplyResources(this.checkBox12, "checkBox12");
+			this.checkBox12.Name = "checkBox12";
+			this.checkBox12.UseVisualStyleBackColor = true;
+			// 
+			// comboBox12
+			// 
+			resources.ApplyResources(this.comboBox12, "comboBox12");
+			this.comboBox12.FormattingEnabled = true;
+			this.comboBox12.Name = "comboBox12";
+			this.comboBox12.SelectedIndexChanged += new System.EventHandler(this.comboBox12_SelectedIndexChanged);
+			this.comboBox12.TextChanged += new System.EventHandler(this.comboBox12_TextChanged);
+			this.comboBox12.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox12_KeyPress);
+			// 
+			// label12
+			// 
+			resources.ApplyResources(this.label12, "label12");
+			this.label12.Name = "label12";
+			// 
+			// checkBox13
+			// 
+			resources.ApplyResources(this.checkBox13, "checkBox13");
+			this.checkBox13.Name = "checkBox13";
+			this.checkBox13.UseVisualStyleBackColor = true;
+			// 
+			// comboBox13
+			// 
+			resources.ApplyResources(this.comboBox13, "comboBox13");
+			this.comboBox13.FormattingEnabled = true;
+			this.comboBox13.Name = "comboBox13";
+			this.comboBox13.SelectedIndexChanged += new System.EventHandler(this.comboBox13_SelectedIndexChanged);
+			this.comboBox13.TextChanged += new System.EventHandler(this.comboBox13_TextChanged);
+			this.comboBox13.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox13_KeyPress);
+			// 
+			// label13
+			// 
+			resources.ApplyResources(this.label13, "label13");
+			this.label13.Name = "label13";
+			// 
+			// checkBox14
+			// 
+			resources.ApplyResources(this.checkBox14, "checkBox14");
+			this.checkBox14.Name = "checkBox14";
+			this.checkBox14.UseVisualStyleBackColor = true;
+			// 
+			// comboBox14
+			// 
+			resources.ApplyResources(this.comboBox14, "comboBox14");
+			this.comboBox14.FormattingEnabled = true;
+			this.comboBox14.Name = "comboBox14";
+			this.comboBox14.SelectedIndexChanged += new System.EventHandler(this.comboBox14_SelectedIndexChanged);
+			this.comboBox14.TextChanged += new System.EventHandler(this.comboBox14_TextChanged);
+			this.comboBox14.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox14_KeyPress);
+			// 
+			// label14
+			// 
+			resources.ApplyResources(this.label14, "label14");
+			this.label14.Name = "label14";
+			// 
+			// checkBox15
+			// 
+			resources.ApplyResources(this.checkBox15, "checkBox15");
+			this.checkBox15.Name = "checkBox15";
+			this.checkBox15.UseVisualStyleBackColor = true;
+			// 
+			// comboBox15
+			// 
+			resources.ApplyResources(this.comboBox15, "comboBox15");
+			this.comboBox15.FormattingEnabled = true;
+			this.comboBox15.Name = "comboBox15";
+			this.comboBox15.SelectedIndexChanged += new System.EventHandler(this.comboBox15_SelectedIndexChanged);
+			this.comboBox15.TextChanged += new System.EventHandler(this.comboBox15_TextChanged);
+			this.comboBox15.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox15_KeyPress);
+			// 
+			// label15
+			// 
+			resources.ApplyResources(this.label15, "label15");
+			this.label15.Name = "label15";
+			// 
+			// checkBox16
+			// 
+			resources.ApplyResources(this.checkBox16, "checkBox16");
+			this.checkBox16.Name = "checkBox16";
+			this.checkBox16.UseVisualStyleBackColor = true;
+			// 
+			// comboBox16
+			// 
+			resources.ApplyResources(this.comboBox16, "comboBox16");
+			this.comboBox16.FormattingEnabled = true;
+			this.comboBox16.Name = "comboBox16";
+			this.comboBox16.SelectedIndexChanged += new System.EventHandler(this.comboBox16_SelectedIndexChanged);
+			this.comboBox16.TextChanged += new System.EventHandler(this.comboBox16_TextChanged);
+			this.comboBox16.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox16_KeyPress);
+			// 
+			// label16
+			// 
+			resources.ApplyResources(this.label16, "label16");
+			this.label16.Name = "label16";
+			// 
+			// checkBox17
+			// 
+			resources.ApplyResources(this.checkBox17, "checkBox17");
+			this.checkBox17.Name = "checkBox17";
+			this.checkBox17.UseVisualStyleBackColor = true;
+			// 
+			// comboBox17
+			// 
+			resources.ApplyResources(this.comboBox17, "comboBox17");
+			this.comboBox17.FormattingEnabled = true;
+			this.comboBox17.Name = "comboBox17";
+			this.comboBox17.SelectedIndexChanged += new System.EventHandler(this.comboBox17_SelectedIndexChanged);
+			this.comboBox17.TextChanged += new System.EventHandler(this.comboBox17_TextChanged);
+			this.comboBox17.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox17_KeyPress);
+			// 
+			// label17
+			// 
+			resources.ApplyResources(this.label17, "label17");
+			this.label17.Name = "label17";
+			// 
+			// checkBox18
+			// 
+			resources.ApplyResources(this.checkBox18, "checkBox18");
+			this.checkBox18.Name = "checkBox18";
+			this.checkBox18.UseVisualStyleBackColor = true;
+			// 
+			// comboBox18
+			// 
+			resources.ApplyResources(this.comboBox18, "comboBox18");
+			this.comboBox18.FormattingEnabled = true;
+			this.comboBox18.Name = "comboBox18";
+			this.comboBox18.SelectedIndexChanged += new System.EventHandler(this.comboBox18_SelectedIndexChanged);
+			this.comboBox18.TextChanged += new System.EventHandler(this.comboBox18_TextChanged);
+			this.comboBox18.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox18_KeyPress);
+			// 
+			// label18
+			// 
+			resources.ApplyResources(this.label18, "label18");
+			this.label18.Name = "label18";
+			// 
+			// checkBox19
+			// 
+			resources.ApplyResources(this.checkBox19, "checkBox19");
+			this.checkBox19.Name = "checkBox19";
+			this.checkBox19.UseVisualStyleBackColor = true;
+			// 
+			// comboBox19
+			// 
+			resources.ApplyResources(this.comboBox19, "comboBox19");
+			this.comboBox19.FormattingEnabled = true;
+			this.comboBox19.Name = "comboBox19";
+			this.comboBox19.SelectedIndexChanged += new System.EventHandler(this.comboBox19_SelectedIndexChanged);
+			this.comboBox19.TextChanged += new System.EventHandler(this.comboBox19_TextChanged);
+			this.comboBox19.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox19_KeyPress);
+			// 
+			// label19
+			// 
+			resources.ApplyResources(this.label19, "label19");
+			this.label19.Name = "label19";
+			// 
+			// checkBox20
+			// 
+			resources.ApplyResources(this.checkBox20, "checkBox20");
+			this.checkBox20.Name = "checkBox20";
+			this.checkBox20.UseVisualStyleBackColor = true;
+			// 
+			// comboBox20
+			// 
+			resources.ApplyResources(this.comboBox20, "comboBox20");
+			this.comboBox20.FormattingEnabled = true;
+			this.comboBox20.Name = "comboBox20";
+			this.comboBox20.SelectedIndexChanged += new System.EventHandler(this.comboBox20_SelectedIndexChanged);
+			this.comboBox20.TextChanged += new System.EventHandler(this.comboBox20_TextChanged);
+			this.comboBox20.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox20_KeyPress);
+			// 
+			// label20
+			// 
+			resources.ApplyResources(this.label20, "label20");
+			this.label20.Name = "label20";
+			// 
+			// checkBox21
+			// 
+			resources.ApplyResources(this.checkBox21, "checkBox21");
+			this.checkBox21.Name = "checkBox21";
+			this.checkBox21.UseVisualStyleBackColor = true;
+			// 
+			// comboBox21
+			// 
+			resources.ApplyResources(this.comboBox21, "comboBox21");
+			this.comboBox21.FormattingEnabled = true;
+			this.comboBox21.Name = "comboBox21";
+			this.comboBox21.SelectedIndexChanged += new System.EventHandler(this.comboBox21_SelectedIndexChanged);
+			this.comboBox21.TextChanged += new System.EventHandler(this.comboBox21_TextChanged);
+			this.comboBox21.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox21_KeyPress);
+			// 
+			// label21
+			// 
+			resources.ApplyResources(this.label21, "label21");
+			this.label21.Name = "label21";
+			// 
+			// checkBox22
+			// 
+			resources.ApplyResources(this.checkBox22, "checkBox22");
+			this.checkBox22.Name = "checkBox22";
+			this.checkBox22.UseVisualStyleBackColor = true;
+			// 
+			// comboBox22
+			// 
+			resources.ApplyResources(this.comboBox22, "comboBox22");
+			this.comboBox22.FormattingEnabled = true;
+			this.comboBox22.Name = "comboBox22";
+			this.comboBox22.SelectedIndexChanged += new System.EventHandler(this.comboBox22_SelectedIndexChanged);
+			this.comboBox22.TextChanged += new System.EventHandler(this.comboBox22_TextChanged);
+			this.comboBox22.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox22_KeyPress);
+			// 
+			// label22
+			// 
+			resources.ApplyResources(this.label22, "label22");
+			this.label22.Name = "label22";
+			// 
+			// checkBox23
+			// 
+			resources.ApplyResources(this.checkBox23, "checkBox23");
+			this.checkBox23.Name = "checkBox23";
+			this.checkBox23.UseVisualStyleBackColor = true;
+			// 
+			// comboBox23
+			// 
+			resources.ApplyResources(this.comboBox23, "comboBox23");
+			this.comboBox23.FormattingEnabled = true;
+			this.comboBox23.Name = "comboBox23";
+			this.comboBox23.SelectedIndexChanged += new System.EventHandler(this.comboBox23_SelectedIndexChanged);
+			this.comboBox23.TextChanged += new System.EventHandler(this.comboBox23_TextChanged);
+			this.comboBox23.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox23_KeyPress);
+			// 
+			// label23
+			// 
+			resources.ApplyResources(this.label23, "label23");
+			this.label23.Name = "label23";
+			// 
+			// checkBox24
+			// 
+			resources.ApplyResources(this.checkBox24, "checkBox24");
+			this.checkBox24.Name = "checkBox24";
+			this.checkBox24.UseVisualStyleBackColor = true;
+			// 
+			// comboBox24
+			// 
+			resources.ApplyResources(this.comboBox24, "comboBox24");
+			this.comboBox24.FormattingEnabled = true;
+			this.comboBox24.Name = "comboBox24";
+			this.comboBox24.SelectedIndexChanged += new System.EventHandler(this.comboBox24_SelectedIndexChanged);
+			this.comboBox24.TextChanged += new System.EventHandler(this.comboBox24_TextChanged);
+			this.comboBox24.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox24_KeyPress);
+			// 
+			// label24
+			// 
+			resources.ApplyResources(this.label24, "label24");
+			this.label24.Name = "label24";
+			// 
+			// CycleBeginningForm
+			// 
+			resources.ApplyResources(this, "$this");
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.BackColor = System.Drawing.Color.DarkGoldenrod;
+			this.Controls.Add(this.checkBox24);
+			this.Controls.Add(this.comboBox24);
+			this.Controls.Add(this.label24);
+			this.Controls.Add(this.checkBox23);
+			this.Controls.Add(this.comboBox23);
+			this.Controls.Add(this.label23);
+			this.Controls.Add(this.checkBox22);
+			this.Controls.Add(this.comboBox22);
+			this.Controls.Add(this.label22);
+			this.Controls.Add(this.checkBox21);
+			this.Controls.Add(this.comboBox21);
+			this.Controls.Add(this.label21);
+			this.Controls.Add(this.checkBox20);
+			this.Controls.Add(this.comboBox20);
+			this.Controls.Add(this.label20);
+			this.Controls.Add(this.checkBox19);
+			this.Controls.Add(this.comboBox19);
+			this.Controls.Add(this.label19);
+			this.Controls.Add(this.checkBox18);
+			this.Controls.Add(this.comboBox18);
+			this.Controls.Add(this.label18);
+			this.Controls.Add(this.checkBox17);
+			this.Controls.Add(this.comboBox17);
+			this.Controls.Add(this.label17);
+			this.Controls.Add(this.checkBox16);
+			this.Controls.Add(this.comboBox16);
+			this.Controls.Add(this.label16);
+			this.Controls.Add(this.checkBox15);
+			this.Controls.Add(this.comboBox15);
+			this.Controls.Add(this.label15);
+			this.Controls.Add(this.checkBox14);
+			this.Controls.Add(this.comboBox14);
+			this.Controls.Add(this.label14);
+			this.Controls.Add(this.checkBox13);
+			this.Controls.Add(this.comboBox13);
+			this.Controls.Add(this.label13);
+			this.Controls.Add(this.checkBox12);
+			this.Controls.Add(this.comboBox12);
+			this.Controls.Add(this.label12);
+			this.Controls.Add(this.checkBox11);
+			this.Controls.Add(this.comboBox11);
+			this.Controls.Add(this.label11);
+			this.Controls.Add(this.checkBox10);
+			this.Controls.Add(this.comboBox10);
+			this.Controls.Add(this.label10);
+			this.Controls.Add(this.checkBox9);
+			this.Controls.Add(this.comboBox9);
+			this.Controls.Add(this.label9);
+			this.Controls.Add(this.checkBox8);
+			this.Controls.Add(this.comboBox8);
+			this.Controls.Add(this.label8);
+			this.Controls.Add(this.checkBox7);
+			this.Controls.Add(this.comboBox7);
+			this.Controls.Add(this.label7);
+			this.Controls.Add(this.checkBox6);
+			this.Controls.Add(this.comboBox6);
+			this.Controls.Add(this.label6);
+			this.Controls.Add(this.checkBox5);
+			this.Controls.Add(this.comboBox5);
+			this.Controls.Add(this.label5);
+			this.Controls.Add(this.checkBox4);
+			this.Controls.Add(this.comboBox4);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.checkBox3);
+			this.Controls.Add(this.comboBox3);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.checkBox2);
+			this.Controls.Add(this.comboBox2);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.checkBox1);
+			this.Controls.Add(this.comboBox1);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.clearButton);
+			this.Controls.Add(this.orderGroupBox);
+			this.Controls.Add(this.okButton);
+			this.ForeColor = System.Drawing.Color.Black;
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+			this.Name = "CycleBeginningForm";
+			this.TopMost = true;
+			this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
+			this.orderGroupBox.ResumeLayout(false);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+        }
+
+        #endregion
+
+		private System.Windows.Forms.Button okButton;
+		private System.Windows.Forms.GroupBox orderGroupBox;
+		private System.Windows.Forms.ComboBox orderComboBox;
+		private System.Windows.Forms.Button clearButton;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ComboBox comboBox1;
+		private System.Windows.Forms.CheckBox checkBox1;
+		private System.Windows.Forms.CheckBox checkBox2;
+		private System.Windows.Forms.ComboBox comboBox2;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.CheckBox checkBox3;
+		private System.Windows.Forms.ComboBox comboBox3;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.CheckBox checkBox4;
+		private System.Windows.Forms.ComboBox comboBox4;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.CheckBox checkBox5;
+		private System.Windows.Forms.ComboBox comboBox5;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.CheckBox checkBox6;
+		private System.Windows.Forms.ComboBox comboBox6;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.CheckBox checkBox7;
+		private System.Windows.Forms.ComboBox comboBox7;
+		private System.Windows.Forms.Label label7;
+		private System.Windows.Forms.CheckBox checkBox8;
+		private System.Windows.Forms.ComboBox comboBox8;
+		private System.Windows.Forms.Label label8;
+		private System.Windows.Forms.CheckBox checkBox9;
+		private System.Windows.Forms.ComboBox comboBox9;
+		private System.Windows.Forms.Label label9;
+		private System.Windows.Forms.CheckBox checkBox10;
+		private System.Windows.Forms.ComboBox comboBox10;
+		private System.Windows.Forms.Label label10;
+		private System.Windows.Forms.CheckBox checkBox11;
+		private System.Windows.Forms.ComboBox comboBox11;
+		private System.Windows.Forms.Label label11;
+		private System.Windows.Forms.CheckBox checkBox12;
+		private System.Windows.Forms.ComboBox comboBox12;
+		private System.Windows.Forms.Label label12;
+		private System.Windows.Forms.CheckBox checkBox13;
+		private System.Windows.Forms.ComboBox comboBox13;
+		private System.Windows.Forms.Label label13;
+		private System.Windows.Forms.CheckBox checkBox14;
+		private System.Windows.Forms.ComboBox comboBox14;
+		private System.Windows.Forms.Label label14;
+		private System.Windows.Forms.CheckBox checkBox15;
+		private System.Windows.Forms.ComboBox comboBox15;
+		private System.Windows.Forms.Label label15;
+		private System.Windows.Forms.CheckBox checkBox16;
+		private System.Windows.Forms.ComboBox comboBox16;
+		private System.Windows.Forms.Label label16;
+		private System.Windows.Forms.CheckBox checkBox17;
+		private System.Windows.Forms.ComboBox comboBox17;
+		private System.Windows.Forms.Label label17;
+		private System.Windows.Forms.CheckBox checkBox18;
+		private System.Windows.Forms.ComboBox comboBox18;
+		private System.Windows.Forms.Label label18;
+		private System.Windows.Forms.CheckBox checkBox19;
+		private System.Windows.Forms.ComboBox comboBox19;
+		private System.Windows.Forms.Label label19;
+		private System.Windows.Forms.CheckBox checkBox20;
+		private System.Windows.Forms.ComboBox comboBox20;
+		private System.Windows.Forms.Label label20;
+		private System.Windows.Forms.CheckBox checkBox21;
+		private System.Windows.Forms.ComboBox comboBox21;
+		private System.Windows.Forms.Label label21;
+		private System.Windows.Forms.CheckBox checkBox22;
+		private System.Windows.Forms.ComboBox comboBox22;
+		private System.Windows.Forms.Label label22;
+		private System.Windows.Forms.CheckBox checkBox23;
+		private System.Windows.Forms.ComboBox comboBox23;
+		private System.Windows.Forms.Label label23;
+		private System.Windows.Forms.CheckBox checkBox24;
+		private System.Windows.Forms.ComboBox comboBox24;
+		private System.Windows.Forms.Label label24;
+    }
+}

TBF/BenchControl/DataEntry/Single/CycleBeginningForm.cs

@@ -0,0 +1,494 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using log4net;
+using TBF.Resources;
+
+namespace TBF.BenchControl.DataEntry.Single
+{
+	public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted
+    {
+		private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm));
+
+		/// <summary> Number of water meters </summary>
+        public readonly int WaterMetersCount;
+
+		/// To be retrieved after the form is closed
+		public string PurchaseOrder;
+		public string[] SNText;
+		public bool[] Disabled;
+
+		/// Set to 'true' when the form closes
+        public bool Completed { get { return completed; } }
+		bool completed;
+
+		/// <summary> Number of text boxes for serial numbers </summary>
+		int textBoxesCount;
+		Label[] labels;
+		ComboBox[] comboBoxes;
+		CheckBox[] checkBoxes;
+		IList<ComboBox> enabledComboBoxes;
+
+
+		/// <summary> Parameterless constructor for common functionality </summary>
+		public CycleBeginningForm()
+		{
+			InitializeComponent();
+			ControlBox = false;
+
+			textBoxesCount = 24;
+			labels = new Label[]
+				{
+					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
+					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
+					label21, label22, label23, label24,
+				};
+			comboBoxes = new ComboBox[]
+				{
+					comboBox1,  comboBox2,  comboBox3,  comboBox4,  comboBox5,  comboBox6,
+					comboBox7,  comboBox8,  comboBox9,  comboBox10, comboBox11, comboBox12,
+					comboBox13, comboBox14, comboBox15, comboBox16, comboBox17, comboBox18,
+					comboBox19, comboBox20, comboBox21, comboBox22, comboBox23, comboBox24,
+				};
+			checkBoxes = new CheckBox[]
+				{
+					checkBox1,  checkBox2,  checkBox3,  checkBox4,  checkBox5,  checkBox6,
+					checkBox7,  checkBox8,  checkBox9,  checkBox10, checkBox11, checkBox12,
+					checkBox13, checkBox14, checkBox15, checkBox16, checkBox17, checkBox18,
+					checkBox19, checkBox20, checkBox21, checkBox22, checkBox23, checkBox24,
+				};
+			enabledComboBoxes = new List<ComboBox>();
+
+			completed = false;
+			StartForceCloseHandler();
+		}
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
+        public CycleBeginningForm(int waterMetersCount)
+			: this()
+        {
+            this.WaterMetersCount = waterMetersCount;
+            SNText = new string[WaterMetersCount];
+			Disabled = new bool[WaterMetersCount];
+
+			ShuffleTextBoxes(Config.Data.WMsCount, Config.Data.LineSize);
+
+            //Height = 147 + WaterMetersCount * 90;
+        }
+
+		/// <summary>
+		/// Make sure the layout of labels/text boxes on the screen
+		/// corresponds to the layout of watermeters of the test bench.
+		/// </summary>
+		/// <param name="wmsCount">Number of watermeters</param>
+		/// <param name="lineSize">Number of watermeters in one line</param>
+		void ShuffleTextBoxes(int wmsCount, int lineSize)
+		{
+			if (wmsCount < textBoxesCount && lineSize > 0)
+			{
+				int nrLines = (wmsCount + lineSize - 1) / lineSize;
+				int gap = (textBoxesCount - wmsCount) / nrLines;
+
+				int dest = 0;
+				for (int l = 0; l < nrLines; l++)
+				{
+					for (int i = 0; i < lineSize; i++)
+					{
+						labels[dest] = labels[l * lineSize + l * gap + i];
+						comboBoxes[dest] = comboBoxes[l * lineSize + l * gap + i];
+						checkBoxes[dest] = checkBoxes[l * lineSize + l * gap + i];
+						dest++;
+					}
+				}
+				textBoxesCount = wmsCount;
+			}
+		}
+
+        private void CycleBeginningForm_Load(object sender, EventArgs e)
+        {
+			Localize();
+			
+			PrepareOrderCombo(orderComboBox);
+
+			for (int i = 0; i < textBoxesCount; i++)
+			{
+				if (Program.LocalSettings.LastSNTextsCount == textBoxesCount)
+				{
+                    comboBoxes[i].Items.Add((Program.LocalSettings.LastSNTexts[i] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[i]);
+                }
+				labels[i].Visible = comboBoxes[i].Visible = checkBoxes[i].Visible = true;
+				enabledComboBoxes.Add(comboBoxes[i]);
+			}
+		}
+
+		void Localize()
+		{
+			Text = Strings.Data;
+			orderGroupBox.Text = Strings.Purchase_order;
+			for (int i = 0; i < textBoxesCount; i++)
+			{
+				labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString();
+			}
+			okButton.Text = Strings.OkBtnText;
+			clearButton.Text = Strings.ClearBtnText;
+		}
+
+		/// <summary>
+		/// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
+		/// </summary>
+		/// <param name="orderComboBox">Puchase order ComboBox</param>
+		void PrepareOrderCombo(ComboBox orderComboBox)
+		{
+			for (int i = 0; i < Program.LocalSettings.PurchaseOrderHistoryCount; i++)
+			{
+				orderComboBox.Items.Add(Program.LocalSettings.PurchaseOrderHistory[i]);
+			}
+
+			if (orderComboBox.Items.Count > 0)
+			{
+				orderComboBox.Text = orderComboBox.Items[0].ToString();
+			}
+		}
+
+		private void okButton_Click(object sender, EventArgs e)
+        {
+			PurchaseOrder = orderComboBox.Text;
+			Program.LocalSettings.UpdateHistory(orderComboBox.Text,
+												ref Program.LocalSettings.PurchaseOrderHistory
+#if FUZHOU_150 || FUZHOU_300
+												, 20
+#endif
+												);
+
+			Program.LocalSettings.LastSNTexts = SNText;
+
+			for (int i = 0; i < Math.Min(WaterMetersCount, textBoxesCount); i++)
+			{
+				SNText[i] = comboBoxes[i].Text;
+				Disabled[i] = !checkBoxes[i].Checked;
+			}
+
+            completed = true;
+            Close();
+        }
+
+		/// <summary>
+		/// When one combo box is updated using drop-down menu, all combo boxes
+		/// are updated by this function.
+		/// </summary>
+		private void UpdateAllCombos()
+		{
+			for (int i = 0; i < Math.Min(WaterMetersCount, textBoxesCount); i++)
+			{
+				comboBoxes[i].Text = Program.LocalSettings.LastSNTexts[i];
+				checkBoxes[i].Checked = !string.IsNullOrEmpty(comboBoxes[i].Text);
+			}
+		}
+
+		private void clearButton_Click(object sender, EventArgs e)
+		{
+			for (int i = 0; i < Math.Min(WaterMetersCount, textBoxesCount); i++)
+			{			
+				comboBoxes[i].Text = string.Empty;
+				checkBoxes[i].Checked = false;
+			}
+		}
+
+
+		private void comboBox1_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; }
+		private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox1.Text.Equals(comboBox1.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox2_TextChanged(object sender, EventArgs e) { checkBox2.Checked = true; }
+		private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox2.Text.Equals(comboBox2.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox3_TextChanged(object sender, EventArgs e) { checkBox3.Checked = true; }
+		private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox3.Text.Equals(comboBox3.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; }
+		private void comboBox4_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox4.Text.Equals(comboBox4.Items[0])) UpdateAllCombos();
+			}
+		}
+ 
+		private void comboBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; }
+		private void comboBox5_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox5.Text.Equals(comboBox5.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; }
+		private void comboBox6_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox6.Text.Equals(comboBox6.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox7_TextChanged(object sender, EventArgs e) { checkBox7.Checked = true; }
+		private void comboBox7_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox7.Text.Equals(comboBox7.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox8_TextChanged(object sender, EventArgs e) { checkBox8.Checked = true; }
+		private void comboBox8_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox8.Text.Equals(comboBox8.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox9_TextChanged(object sender, EventArgs e) { checkBox9.Checked = true; }
+		private void comboBox9_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox9.Text.Equals(comboBox9.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox10_TextChanged(object sender, EventArgs e) { checkBox10.Checked = true; }
+		private void comboBox10_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox10.Text.Equals(comboBox10.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox11_TextChanged(object sender, EventArgs e) { checkBox11.Checked = true; }
+		private void comboBox11_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox11.Text.Equals(comboBox11.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox12_TextChanged(object sender, EventArgs e) { checkBox12.Checked = true; }
+		private void comboBox12_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox12.Text.Equals(comboBox12.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox13_TextChanged(object sender, EventArgs e) { checkBox13.Checked = true; }
+		private void comboBox13_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox13.Text.Equals(comboBox13.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox14_TextChanged(object sender, EventArgs e) { checkBox14.Checked = true; }
+		private void comboBox14_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox14.Text.Equals(comboBox14.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox15_TextChanged(object sender, EventArgs e) { checkBox15.Checked = true; }
+		private void comboBox15_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox15.Text.Equals(comboBox15.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox16_TextChanged(object sender, EventArgs e) { checkBox16.Checked = true; }
+		private void comboBox16_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox16.Text.Equals(comboBox16.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox17_TextChanged(object sender, EventArgs e) { checkBox17.Checked = true; }
+		private void comboBox17_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox17.Text.Equals(comboBox17.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox18_TextChanged(object sender, EventArgs e) { checkBox18.Checked = true; }
+		private void comboBox18_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox18.Text.Equals(comboBox18.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox19_TextChanged(object sender, EventArgs e) { checkBox19.Checked = true; }
+		private void comboBox19_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox19.Text.Equals(comboBox19.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox20_TextChanged(object sender, EventArgs e) { checkBox20.Checked = true; }
+		private void comboBox20_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox20.Text.Equals(comboBox20.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox21_TextChanged(object sender, EventArgs e) { checkBox21.Checked = true; }
+		private void comboBox21_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox21.Text.Equals(comboBox21.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox22_TextChanged(object sender, EventArgs e) { checkBox22.Checked = true; }
+		private void comboBox22_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox22.Text.Equals(comboBox22.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox23_TextChanged(object sender, EventArgs e) { checkBox23.Checked = true; }
+		private void comboBox23_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox23.Text.Equals(comboBox23.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		private void comboBox24_TextChanged(object sender, EventArgs e) { checkBox24.Checked = true; }
+		private void comboBox24_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			{
+				if (comboBox24.Text.Equals(comboBox24.Items[0])) UpdateAllCombos();
+			}
+		}
+
+		#region Forced close handling
+
+		public void StartForceCloseHandler()
+		{
+			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
+			{
+				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
+				else OnForceClose(sender, args);
+			};
+		}
+
+		private void OnForceClose(object sender, EventArgs args)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Process a key press within any enabled text boxe
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		/// <param name="currentFocusOwner">TextBox control which received the event</param>
+		private void ProcKeyPress(object sender, KeyPressEventArgs e, ComboBox currentFocusOwner)
+		{
+			if (e.KeyChar == '+')
+			{
+				/// Process '+' key ..... Form completed
+				okButton_Click(sender, e);
+			}
+			if (e.KeyChar == '\r')
+			{
+				/// Process <enter> key ..... Next text field
+				if (enabledComboBoxes.Count < 2) return;		/// There is just one enabled textbox
+
+				for (int i = 0; i < enabledComboBoxes.Count; i++)
+				{
+					if (enabledComboBoxes[i] == currentFocusOwner)
+					{
+						/// Change focus to the next enabled text box
+						enabledComboBoxes[(i + 1) % enabledComboBoxes.Count].Focus();
+						return;
+					}
+				}
+			}
+		}
+
+		private void comboBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox1); }
+		private void comboBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox2); }
+		private void comboBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox3); }
+		private void comboBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox4); }
+		private void comboBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox5); }
+		private void comboBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox6); }
+		private void comboBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox7); }
+		private void comboBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox8); }
+		private void comboBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox9); }
+		private void comboBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox10); }
+		private void comboBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox11); }
+		private void comboBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox12); }
+		private void comboBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox13); }
+		private void comboBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox14); }
+		private void comboBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox15); }
+		private void comboBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox16); }
+		private void comboBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox17); }
+		private void comboBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox18); }
+		private void comboBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox19); }
+		private void comboBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox20); }
+		private void comboBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox21); }
+		private void comboBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox22); }
+		private void comboBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox23); }
+		private void comboBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox24); }
+   }
+}

TBF/BenchControl/DataEntry/Single/CycleEndForm.Designer.cs

@@ -0,0 +1,652 @@
+///
+/// Copyright (c) 2018 Sensus Slovensko a.s.
+///
+namespace TBF.BenchControl.DataEntry.Single
+{
+    partial class CycleEndForm
+    {
+        /// <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.textBox2 = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.okButton = new System.Windows.Forms.Button();
+            this.textBox3 = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.textBox4 = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.textBox5 = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.textBox6 = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.textBox7 = new System.Windows.Forms.TextBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.textBox8 = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.textBox9 = new System.Windows.Forms.TextBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.textBox10 = new System.Windows.Forms.TextBox();
+            this.label10 = new System.Windows.Forms.Label();
+            this.textBox11 = new System.Windows.Forms.TextBox();
+            this.label11 = new System.Windows.Forms.Label();
+            this.textBox12 = new System.Windows.Forms.TextBox();
+            this.label12 = new System.Windows.Forms.Label();
+            this.textBox13 = new System.Windows.Forms.TextBox();
+            this.label13 = new System.Windows.Forms.Label();
+            this.textBox14 = new System.Windows.Forms.TextBox();
+            this.label14 = new System.Windows.Forms.Label();
+            this.textBox15 = new System.Windows.Forms.TextBox();
+            this.label15 = new System.Windows.Forms.Label();
+            this.textBox16 = new System.Windows.Forms.TextBox();
+            this.label16 = new System.Windows.Forms.Label();
+            this.textBox17 = new System.Windows.Forms.TextBox();
+            this.label17 = new System.Windows.Forms.Label();
+            this.textBox18 = new System.Windows.Forms.TextBox();
+            this.label18 = new System.Windows.Forms.Label();
+            this.textBox19 = new System.Windows.Forms.TextBox();
+            this.label19 = new System.Windows.Forms.Label();
+            this.textBox20 = new System.Windows.Forms.TextBox();
+            this.label20 = new System.Windows.Forms.Label();
+            this.textBox21 = new System.Windows.Forms.TextBox();
+            this.label21 = new System.Windows.Forms.Label();
+            this.textBox22 = new System.Windows.Forms.TextBox();
+            this.label22 = new System.Windows.Forms.Label();
+            this.textBox23 = new System.Windows.Forms.TextBox();
+            this.label23 = new System.Windows.Forms.Label();
+            this.textBox24 = new System.Windows.Forms.TextBox();
+            this.label24 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // textBox2
+            // 
+            this.textBox2.Location = new System.Drawing.Point(205, 66);
+            this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox2.Name = "textBox2";
+            this.textBox2.Size = new System.Drawing.Size(169, 27);
+            this.textBox2.TabIndex = 1;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(38, 71);
+            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(62, 18);
+            this.label2.TabIndex = 0;
+            this.label2.Text = "Stand:";
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(205, 30);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(169, 27);
+            this.textBox1.TabIndex = 1;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(38, 35);
+            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(62, 18);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Stand:";
+            // 
+            // okButton
+            // 
+            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.okButton.ForeColor = System.Drawing.Color.Black;
+            this.okButton.Location = new System.Drawing.Point(832, 30);
+            this.okButton.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(90, 60);
+            this.okButton.TabIndex = 7;
+            this.okButton.Text = "OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // textBox3
+            // 
+            this.textBox3.Location = new System.Drawing.Point(205, 102);
+            this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox3.Name = "textBox3";
+            this.textBox3.Size = new System.Drawing.Size(169, 27);
+            this.textBox3.TabIndex = 1;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(38, 107);
+            this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(62, 18);
+            this.label3.TabIndex = 0;
+            this.label3.Text = "Stand:";
+            // 
+            // textBox4
+            // 
+            this.textBox4.Location = new System.Drawing.Point(205, 138);
+            this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox4.Name = "textBox4";
+            this.textBox4.Size = new System.Drawing.Size(169, 27);
+            this.textBox4.TabIndex = 1;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(38, 143);
+            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(62, 18);
+            this.label4.TabIndex = 0;
+            this.label4.Text = "Stand:";
+            // 
+            // textBox5
+            // 
+            this.textBox5.Location = new System.Drawing.Point(205, 174);
+            this.textBox5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox5.Name = "textBox5";
+            this.textBox5.Size = new System.Drawing.Size(169, 27);
+            this.textBox5.TabIndex = 1;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(38, 179);
+            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(62, 18);
+            this.label5.TabIndex = 0;
+            this.label5.Text = "Stand:";
+            // 
+            // textBox6
+            // 
+            this.textBox6.Location = new System.Drawing.Point(205, 210);
+            this.textBox6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox6.Name = "textBox6";
+            this.textBox6.Size = new System.Drawing.Size(169, 27);
+            this.textBox6.TabIndex = 1;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(38, 215);
+            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(62, 18);
+            this.label6.TabIndex = 0;
+            this.label6.Text = "Stand:";
+            // 
+            // textBox7
+            // 
+            this.textBox7.Location = new System.Drawing.Point(205, 246);
+            this.textBox7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox7.Name = "textBox7";
+            this.textBox7.Size = new System.Drawing.Size(169, 27);
+            this.textBox7.TabIndex = 9;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(38, 251);
+            this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(62, 18);
+            this.label7.TabIndex = 8;
+            this.label7.Text = "Stand:";
+            // 
+            // textBox8
+            // 
+            this.textBox8.Location = new System.Drawing.Point(205, 282);
+            this.textBox8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox8.Name = "textBox8";
+            this.textBox8.Size = new System.Drawing.Size(169, 27);
+            this.textBox8.TabIndex = 11;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(38, 287);
+            this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(62, 18);
+            this.label8.TabIndex = 10;
+            this.label8.Text = "Stand:";
+            // 
+            // textBox9
+            // 
+            this.textBox9.Location = new System.Drawing.Point(205, 318);
+            this.textBox9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox9.Name = "textBox9";
+            this.textBox9.Size = new System.Drawing.Size(169, 27);
+            this.textBox9.TabIndex = 13;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(38, 323);
+            this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(62, 18);
+            this.label9.TabIndex = 12;
+            this.label9.Text = "Stand:";
+            // 
+            // textBox10
+            // 
+            this.textBox10.Location = new System.Drawing.Point(205, 354);
+            this.textBox10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox10.Name = "textBox10";
+            this.textBox10.Size = new System.Drawing.Size(169, 27);
+            this.textBox10.TabIndex = 15;
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(38, 359);
+            this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(62, 18);
+            this.label10.TabIndex = 14;
+            this.label10.Text = "Stand:";
+            // 
+            // textBox11
+            // 
+            this.textBox11.Location = new System.Drawing.Point(205, 390);
+            this.textBox11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox11.Name = "textBox11";
+            this.textBox11.Size = new System.Drawing.Size(169, 27);
+            this.textBox11.TabIndex = 17;
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Location = new System.Drawing.Point(38, 395);
+            this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(62, 18);
+            this.label11.TabIndex = 16;
+            this.label11.Text = "Stand:";
+            // 
+            // textBox12
+            // 
+            this.textBox12.Location = new System.Drawing.Point(205, 426);
+            this.textBox12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox12.Name = "textBox12";
+            this.textBox12.Size = new System.Drawing.Size(169, 27);
+            this.textBox12.TabIndex = 19;
+            // 
+            // label12
+            // 
+            this.label12.AutoSize = true;
+            this.label12.Location = new System.Drawing.Point(38, 431);
+            this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(62, 18);
+            this.label12.TabIndex = 18;
+            this.label12.Text = "Stand:";
+            // 
+            // textBox13
+            // 
+            this.textBox13.Location = new System.Drawing.Point(623, 30);
+            this.textBox13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox13.Name = "textBox13";
+            this.textBox13.Size = new System.Drawing.Size(169, 27);
+            this.textBox13.TabIndex = 21;
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Location = new System.Drawing.Point(456, 35);
+            this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(62, 18);
+            this.label13.TabIndex = 20;
+            this.label13.Text = "Stand:";
+            // 
+            // textBox14
+            // 
+            this.textBox14.Location = new System.Drawing.Point(623, 66);
+            this.textBox14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox14.Name = "textBox14";
+            this.textBox14.Size = new System.Drawing.Size(169, 27);
+            this.textBox14.TabIndex = 23;
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Location = new System.Drawing.Point(456, 71);
+            this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(62, 18);
+            this.label14.TabIndex = 22;
+            this.label14.Text = "Stand:";
+            // 
+            // textBox15
+            // 
+            this.textBox15.Location = new System.Drawing.Point(623, 102);
+            this.textBox15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox15.Name = "textBox15";
+            this.textBox15.Size = new System.Drawing.Size(169, 27);
+            this.textBox15.TabIndex = 25;
+            // 
+            // label15
+            // 
+            this.label15.AutoSize = true;
+            this.label15.Location = new System.Drawing.Point(456, 107);
+            this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(62, 18);
+            this.label15.TabIndex = 24;
+            this.label15.Text = "Stand:";
+            // 
+            // textBox16
+            // 
+            this.textBox16.Location = new System.Drawing.Point(623, 138);
+            this.textBox16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox16.Name = "textBox16";
+            this.textBox16.Size = new System.Drawing.Size(169, 27);
+            this.textBox16.TabIndex = 27;
+            // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Location = new System.Drawing.Point(456, 143);
+            this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(62, 18);
+            this.label16.TabIndex = 26;
+            this.label16.Text = "Stand:";
+            // 
+            // textBox17
+            // 
+            this.textBox17.Location = new System.Drawing.Point(623, 174);
+            this.textBox17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox17.Name = "textBox17";
+            this.textBox17.Size = new System.Drawing.Size(169, 27);
+            this.textBox17.TabIndex = 29;
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Location = new System.Drawing.Point(456, 179);
+            this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(62, 18);
+            this.label17.TabIndex = 28;
+            this.label17.Text = "Stand:";
+            // 
+            // textBox18
+            // 
+            this.textBox18.Location = new System.Drawing.Point(623, 210);
+            this.textBox18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox18.Name = "textBox18";
+            this.textBox18.Size = new System.Drawing.Size(169, 27);
+            this.textBox18.TabIndex = 31;
+            // 
+            // label18
+            // 
+            this.label18.AutoSize = true;
+            this.label18.Location = new System.Drawing.Point(456, 215);
+            this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(62, 18);
+            this.label18.TabIndex = 30;
+            this.label18.Text = "Stand:";
+            // 
+            // textBox19
+            // 
+            this.textBox19.Location = new System.Drawing.Point(623, 246);
+            this.textBox19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox19.Name = "textBox19";
+            this.textBox19.Size = new System.Drawing.Size(169, 27);
+            this.textBox19.TabIndex = 33;
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.Location = new System.Drawing.Point(456, 251);
+            this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(62, 18);
+            this.label19.TabIndex = 32;
+            this.label19.Text = "Stand:";
+            // 
+            // textBox20
+            // 
+            this.textBox20.Location = new System.Drawing.Point(623, 282);
+            this.textBox20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox20.Name = "textBox20";
+            this.textBox20.Size = new System.Drawing.Size(169, 27);
+            this.textBox20.TabIndex = 35;
+            // 
+            // label20
+            // 
+            this.label20.AutoSize = true;
+            this.label20.Location = new System.Drawing.Point(456, 287);
+            this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label20.Name = "label20";
+            this.label20.Size = new System.Drawing.Size(62, 18);
+            this.label20.TabIndex = 34;
+            this.label20.Text = "Stand:";
+            // 
+            // textBox21
+            // 
+            this.textBox21.Location = new System.Drawing.Point(623, 318);
+            this.textBox21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox21.Name = "textBox21";
+            this.textBox21.Size = new System.Drawing.Size(169, 27);
+            this.textBox21.TabIndex = 37;
+            // 
+            // label21
+            // 
+            this.label21.AutoSize = true;
+            this.label21.Location = new System.Drawing.Point(456, 323);
+            this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label21.Name = "label21";
+            this.label21.Size = new System.Drawing.Size(62, 18);
+            this.label21.TabIndex = 36;
+            this.label21.Text = "Stand:";
+            // 
+            // textBox22
+            // 
+            this.textBox22.Location = new System.Drawing.Point(623, 354);
+            this.textBox22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox22.Name = "textBox22";
+            this.textBox22.Size = new System.Drawing.Size(169, 27);
+            this.textBox22.TabIndex = 39;
+            // 
+            // label22
+            // 
+            this.label22.AutoSize = true;
+            this.label22.Location = new System.Drawing.Point(456, 359);
+            this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label22.Name = "label22";
+            this.label22.Size = new System.Drawing.Size(62, 18);
+            this.label22.TabIndex = 38;
+            this.label22.Text = "Stand:";
+            // 
+            // textBox23
+            // 
+            this.textBox23.Location = new System.Drawing.Point(623, 390);
+            this.textBox23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox23.Name = "textBox23";
+            this.textBox23.Size = new System.Drawing.Size(169, 27);
+            this.textBox23.TabIndex = 41;
+            // 
+            // label23
+            // 
+            this.label23.AutoSize = true;
+            this.label23.Location = new System.Drawing.Point(456, 395);
+            this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label23.Name = "label23";
+            this.label23.Size = new System.Drawing.Size(62, 18);
+            this.label23.TabIndex = 40;
+            this.label23.Text = "Stand:";
+            // 
+            // textBox24
+            // 
+            this.textBox24.Location = new System.Drawing.Point(623, 426);
+            this.textBox24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.textBox24.Name = "textBox24";
+            this.textBox24.Size = new System.Drawing.Size(169, 27);
+            this.textBox24.TabIndex = 43;
+            // 
+            // label24
+            // 
+            this.label24.AutoSize = true;
+            this.label24.Location = new System.Drawing.Point(456, 431);
+            this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(62, 18);
+            this.label24.TabIndex = 42;
+            this.label24.Text = "Stand:";
+            // 
+            // CycleEndForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.DarkGoldenrod;
+            this.ClientSize = new System.Drawing.Size(959, 489);
+            this.Controls.Add(this.textBox24);
+            this.Controls.Add(this.label24);
+            this.Controls.Add(this.textBox23);
+            this.Controls.Add(this.label23);
+            this.Controls.Add(this.textBox22);
+            this.Controls.Add(this.label22);
+            this.Controls.Add(this.textBox21);
+            this.Controls.Add(this.label21);
+            this.Controls.Add(this.textBox20);
+            this.Controls.Add(this.label20);
+            this.Controls.Add(this.textBox19);
+            this.Controls.Add(this.label19);
+            this.Controls.Add(this.textBox18);
+            this.Controls.Add(this.label18);
+            this.Controls.Add(this.textBox17);
+            this.Controls.Add(this.label17);
+            this.Controls.Add(this.textBox16);
+            this.Controls.Add(this.label16);
+            this.Controls.Add(this.textBox15);
+            this.Controls.Add(this.label15);
+            this.Controls.Add(this.textBox14);
+            this.Controls.Add(this.label14);
+            this.Controls.Add(this.textBox13);
+            this.Controls.Add(this.label13);
+            this.Controls.Add(this.textBox12);
+            this.Controls.Add(this.label12);
+            this.Controls.Add(this.textBox11);
+            this.Controls.Add(this.label11);
+            this.Controls.Add(this.textBox10);
+            this.Controls.Add(this.label10);
+            this.Controls.Add(this.textBox9);
+            this.Controls.Add(this.label9);
+            this.Controls.Add(this.textBox8);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.textBox7);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.textBox6);
+            this.Controls.Add(this.label6);
+            this.Controls.Add(this.textBox5);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.textBox4);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.textBox3);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.textBox2);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.okButton);
+            this.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.Name = "CycleEndForm";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.Text = "Daten";
+            this.TopMost = true;
+            this.Load += new System.EventHandler(this.CycleEndForm_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox textBox2;
+        private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.TextBox textBox1;
+		private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button okButton;
+        private System.Windows.Forms.TextBox textBox3;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox textBox4;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox textBox5;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox textBox6;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox textBox7;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.TextBox textBox8;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.TextBox textBox9;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.TextBox textBox10;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.TextBox textBox11;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.TextBox textBox12;
+        private System.Windows.Forms.Label label12;
+        private System.Windows.Forms.TextBox textBox13;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.TextBox textBox14;
+        private System.Windows.Forms.Label label14;
+        private System.Windows.Forms.TextBox textBox15;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.TextBox textBox16;
+        private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.TextBox textBox17;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.TextBox textBox18;
+        private System.Windows.Forms.Label label18;
+        private System.Windows.Forms.TextBox textBox19;
+        private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.TextBox textBox20;
+        private System.Windows.Forms.Label label20;
+        private System.Windows.Forms.TextBox textBox21;
+        private System.Windows.Forms.Label label21;
+        private System.Windows.Forms.TextBox textBox22;
+        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.TextBox textBox23;
+        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.TextBox textBox24;
+        private System.Windows.Forms.Label label24;
+
+	}
+}