improve logs and added try, catch blocks

.gitignore

@@ -44,6 +44,8 @@ ResultsBrowser/bin/
 ResultsBrowser/obj/
 ResultsParser/bin/
 ResultsParser/obj/
+S640TestApp/bin/
+S640TestApp/obj/
 SharedDatabase/bin
 SharedDatabase/obj
 SchematicDrawing/bin

Common/CurrentUser.cs

@@ -96,6 +96,16 @@ namespace Common
                 return string.Format("{0},{1},{2}", User().UserName, User2.UserName, User3.UserName);
         }
 
+        public static string GetEncodedString(string legalizator)
+        {
+            if (User() == null || User().UserName == null) return string.Empty;
+            return string.Format("{0}~{1}~{2}",
+                                 User().UserName,
+                                 User().FullName == null ? string.Empty : User().FullName,
+                                 legalizator == null ? string.Empty : legalizator);
+        }
+                
+
         /// <summary>
         /// Return the current user number or 0
         /// </summary>

Common/Enums.cs

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

Common/Utils.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 
@@ -20,6 +20,18 @@ namespace Common
             return (format == "F0") ? value.ToString("F0") : value.ToString(format).TrimEnd(new char[] { '0' });
         }
 
+        public static FlowNames ProfileType2FlowNames(ProfileType pt)
+        {
+            switch (pt)
+            {
+                case ProfileType.Q3R:               return FlowNames.Q3Q2Q1;
+                case ProfileType.QnClassColdWater:  return FlowNames.QnQtQmin;
+                case ProfileType.QnClassHotWater:   return FlowNames.QnQtQmin;
+                case ProfileType.QpQi:              return FlowNames.QpQi;
+                default:                            return FlowNames.Q3Q2Q1;
+            }
+        }
+
         public static string SignificantDigitsToFmt(double value, int sigDigits)
         {
             if (sigDigits == 6)
@@ -278,14 +290,13 @@ namespace Common
             int number = (date.Year % 10) + 10 * (date.Month - 1) + 120 * date.Day;
             string passwordOfDay = Convert.ToString(number, 8);
 
-            return (userName.Equals("milan") && password.Equals("kremik")) ||
+            return (userName.Equals("milan") && password.Equals("kraken")) ||
                    (userName.Equals("igor") && password.Equals("mojronko8")) ||
-                   (userName.Equals("MARIAN") && password.Equals("NM-309BN")) ||
                    (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
-                   (userName.Equals("Michal") && password.Equals("1236natahA8")) ||
+                   (userName.Equals("Michal") && password.Equals("Plok789456123")) ||
                    (userName.Equals("martin") && password.Equals("vaclavek84")) ||
                    (userName.Equals("pakan") && password.Equals("kuriatko")) ||
-                   (userName.Equals("augustin") && password.Equals("jaugust")) ||
+                   (userName.Equals("jan") && password.Equals("jaugust")) ||
                    (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
                    (userName.Equals("gilles") && password.Equals("alibaba")) ||
                    (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));

Config/Entities/FeedingPath.cs

@@ -18,7 +18,7 @@ namespace Config.Entities
         public virtual Unit   FlowUnit { get; set; }        /// Not mapped to database, used in UI
         public virtual string Selector { get; set; }
 		public virtual string Pump { get; set; }
-        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in % separated by ';'
+        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in Category.Feeding in % separated by ';'
 
         /// Valves
 		public virtual string ValvesOpen { get; set; }

Config/Entities/OutputPath.cs

@@ -24,6 +24,7 @@ namespace Config.Entities
         public virtual string Diverter { get; set; }
 		public virtual string TempMtrDiv { get; set; }
 		public virtual string Scale { get; set; }
+        public virtual string RegVPositions { get; set; }	/// Positions of regulation valves in Category.Output in % separated by ';'
 
         /// Valves		
 		public virtual string ValvesOpen { get; set; }
@@ -63,6 +64,7 @@ namespace Config.Entities
 			result.Diverter    = Diverter;
 			result.TempMtrDiv  = TempMtrDiv;
 			result.Scale       = Scale;
+            result.RegVPositions= RegVPositions;
 			result.ValvesOpen  = ValvesOpen;
 			result.ValvesClose = ValvesClose;
 

Config/Entities/PTest.cs

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

Config/Entities/Procedure.cs

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

Config/Entities/Profile.cs

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

Config/FluentCommon.cs

@@ -128,7 +128,7 @@ namespace Config
                             case GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
                             case GID.TraceabilityManagement:
-#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
+#elif LANG_PL
                             case GID.MetrologicalAuthority:
                             case GID.WaterMeterAuthority:
 #endif

Config/Mappings/OutputPathMap.cs

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

Config/Mappings/PTestMap.cs

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

OrderManagement/LocalSettings.cs

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

OrderManagement/OrderManagementDlg.Designer.cs

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

OrderManagement/OrderManagementDlg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -10,6 +10,7 @@ using Common;
 using SharedDatabase.Entities;
 using OrderManagement.Resources;
 using Common.Forms;
+using SharedDatabase;
 
 namespace OrderManagement
 {
@@ -92,6 +93,8 @@ namespace OrderManagement
         {
             Order,
             State,
+            Pieces,
+            CurrentPcs,
             Workflow,
             Procedure,
             Variant,
@@ -101,7 +104,6 @@ namespace OrderManagement
             ModuleParam,
             LaserMarking,
             Packing,
-            Pieces,
             SNPrefix,
             SNFirst,
             SNDigitsCount,
@@ -115,8 +117,10 @@ namespace OrderManagement
 
         void InitializeColumns(ListView lv)
         {
-            lv.Columns.Add(new ColumnHeader { Text = Strings.Order,                           Width = 65 });
-            lv.Columns.Add(new ColumnHeader { Text = Strings.State,                           Width = 65 });
+            lv.Columns.Add(new ColumnHeader { Text = Strings.Order,                           Width = 70 });
+            lv.Columns.Add(new ColumnHeader { Text = Strings.State,                           Width = 60 });
+            lv.Columns.Add(new ColumnHeader { Text = "Target",                                Width = 50 });
+            lv.Columns.Add(new ColumnHeader { Text = "Produced",                              Width = 60 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Workflow,                        Width = 100 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Test_procedure,                  Width = 200 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Variant_code,                    Width = 150 });
@@ -126,7 +130,6 @@ namespace OrderManagement
             lv.Columns.Add(new ColumnHeader { Text = Strings.Module_parameter,                Width = 100 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Laser_marking,                   Width = 100 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Packing,                         Width = 100 });
-            lv.Columns.Add(new ColumnHeader { Text = Strings.Pieces_count,                    Width = 80 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.prefix,       Width = 80 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.first,        Width = 80 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.SN + " " + Strings.digits_count, Width = 80 });
@@ -141,6 +144,8 @@ namespace OrderManagement
         {
             ListViewItem lvi = new ListViewItem(o.POName);
             lvi.SubItems.Add(((OrderState)o.POState).ToString());
+            lvi.SubItems.Add(o.PiecesCount.ToString());
+            lvi.SubItems.Add(o.CurrentPcsCount.ToString());
             lvi.SubItems.Add(o.Workflow);
             lvi.SubItems.Add(o.TestProcedure);
             lvi.SubItems.Add(o.VariantCode);
@@ -150,7 +155,6 @@ namespace OrderManagement
             lvi.SubItems.Add(o.ModuleParam);
             lvi.SubItems.Add(o.LaserMarking);
             lvi.SubItems.Add(o.Packing);
-            lvi.SubItems.Add(o.PiecesCount.ToString());
             lvi.SubItems.Add(o.SNPrefix);
             lvi.SubItems.Add(o.SNFirst.ToString(string.Format("D{0}", o.SNDigitsCount)));
             lvi.SubItems.Add(o.SNDigitsCount.ToString());
@@ -168,6 +172,8 @@ namespace OrderManagement
             int i = 0;
             lvi.SubItems[i++].Text = o.POName;
             lvi.SubItems[i++].Text = ((OrderState)o.POState).ToString();
+            lvi.SubItems[i++].Text = o.PiecesCount.ToString();
+            lvi.SubItems[i++].Text = o.CurrentPcsCount.ToString();
             lvi.SubItems[i++].Text = o.Workflow;
             lvi.SubItems[i++].Text = o.TestProcedure;
             lvi.SubItems[i++].Text = o.VariantCode;
@@ -177,7 +183,6 @@ namespace OrderManagement
             lvi.SubItems[i++].Text = o.ModuleParam;
             lvi.SubItems[i++].Text = o.LaserMarking;
             lvi.SubItems[i++].Text = o.Packing;
-            lvi.SubItems[i++].Text = o.PiecesCount.ToString();
             lvi.SubItems[i++].Text = o.SNPrefix;
             lvi.SubItems[i++].Text = o.SNFirst.ToString(string.Format("D{0}", o.SNDigitsCount));
             lvi.SubItems[i++].Text = o.SNDigitsCount.ToString();
@@ -288,6 +293,46 @@ namespace OrderManagement
             }
         }
 
+        private void finishButton_Click(object sender, EventArgs e)
+        {
+            if (listViewEx1.SelectedItems.Count != 1 || !(listViewEx1.SelectedItems[0].Tag is OrderInfo)) return;
+
+            OrderInfo order = listViewEx1.SelectedItems[0].Tag as OrderInfo;
+            if (order.POState == (sbyte)OrderState.Active && order.CurrentPcsCount >= order.PiecesCount)
+            {
+                ISession session = null;
+                try
+                {
+                    session = sessionFactory.OpenSession();
+
+                    var selectedOrders = session.QueryOver<OrderInfo>()
+                                                .Where(x => x.Id == order.Id)
+                                                .List();
+
+                    if (selectedOrders.Count == 1)
+                    {
+                        selectedOrders[0].POState = (sbyte)OrderState.Finished;
+                        session.SaveOrUpdate(selectedOrders[0]);
+                        session.Flush();
+                        order.POState = (sbyte)OrderState.Finished;
+                        UpdateRow(listViewEx1.SelectedItems[0], order);
+                    }                      
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Changing production order state failed: {0}", ex.Message);
+                }
+                finally
+                {
+                    if (session != null && session.IsOpen) session.Close();
+                }
+            }
+            else
+            {
+                MessageBox.Show(Strings.You_can_only_finish_completed_production_orders);
+            }
+        }
+
         private void copyButton_Click(object sender, EventArgs e)
         {
             if (listViewEx1.SelectedItems.Count != 1 || !(listViewEx1.SelectedItems[0].Tag is OrderInfo)) return;

OrderManagement/Program.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -14,6 +14,7 @@ using Common;
 using SharedDatabase;
 using SharedDatabase.Entities;
 using OrderManagement.Resources;
+using System.Linq;
 
 namespace OrderManagement
 {
@@ -186,7 +187,16 @@ namespace OrderManagement
 
                     ISession session = sessionFactory.OpenSession();
 
-                    listOfOrders = session.QueryOver<OrderInfo>().List();
+                    if (LocalSettings.IsShowFinishedOrders)
+                    {
+                        listOfOrders = session.QueryOver<OrderInfo>().List();
+                    }
+                    else
+                    {
+                        listOfOrders = session.QueryOver<OrderInfo>()
+                                              .Where(x => x.POState != (sbyte)OrderState.Finished)
+                                              .List();
+                    }
 
                     listOfWorkflows = session.QueryOver<Process>()
                                              .Where(x => x.ReleaseStatus != ReleaseStatus.Deactivated)

OrderManagement/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("OrderManagement")]
-[assembly: AssemblyCopyright("Copyright ©  2021-2022")]
+[assembly: AssemblyCopyright("Copyright ©  2021-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.13.0")]
-[assembly: AssemblyFileVersion("3.0.13.0")]
+[assembly: AssemblyVersion("3.0.14.0")]
+[assembly: AssemblyFileVersion("3.0.14.0")]

OrderManagement/Resources/Strings.Designer.cs

@@ -19,7 +19,7 @@ namespace OrderManagement.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Strings {
@@ -637,7 +637,7 @@ namespace OrderManagement.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You can only delete &apos;New&apos; porduction orders.
+        ///   Looks up a localized string similar to You can only delete &apos;New&apos; production orders.
         /// </summary>
         internal static string You_can_only_delete_New_porduction_orders {
             get {
@@ -646,12 +646,21 @@ namespace OrderManagement.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You can only edit &apos;New&apos; porduction orders.
+        ///   Looks up a localized string similar to You can only edit &apos;New&apos; production orders.
         /// </summary>
         internal static string You_can_only_edit_New_porduction_orders {
             get {
                 return ResourceManager.GetString("You_can_only_edit_New_porduction_orders", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You can only finish completed production orders.
+        /// </summary>
+        internal static string You_can_only_finish_completed_production_orders {
+            get {
+                return ResourceManager.GetString("You_can_only_finish_completed_production_orders", resourceCulture);
+            }
+        }
     }
 }

OrderManagement/Resources/Strings.resx

@@ -223,10 +223,10 @@
     <value>S/N</value>
   </data>
   <data name="You_can_only_edit_New_porduction_orders" xml:space="preserve">
-    <value>You can only edit 'New' porduction orders</value>
+    <value>You can only edit 'New' production orders</value>
   </data>
   <data name="You_can_only_delete_New_porduction_orders" xml:space="preserve">
-    <value>You can only delete 'New' porduction orders</value>
+    <value>You can only delete 'New' production orders</value>
   </data>
   <data name="Laser_marking" xml:space="preserve">
     <value>Laser marking</value>
@@ -315,4 +315,7 @@
   <data name="Print" xml:space="preserve">
     <value>Print</value>
   </data>
+  <data name="You_can_only_finish_completed_production_orders" xml:space="preserve">
+    <value>You can only finish completed production orders</value>
+  </data>
 </root>

OrderManagement/SettingsDlg.Designer.cs

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

OrderManagement/SettingsDlg.cs

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

Results/Entities/Batch.cs

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

Results/Entities/MeterTestRslt.cs

@@ -82,7 +82,7 @@ namespace Results.Entities
 		public virtual double QRise()		  { return WaterMeter.QRise; }			/// [m3/h]
 		public virtual double QFall()		  { return WaterMeter.QFall; }			/// [m3/h]
 
-		public virtual bool    Evaluate()     { return TestData().Evaluate; }
+		public virtual bool   Evaluate()      { return TestData().Evaluate; }
 		public virtual Publish Publish()      { return (Publish)TestData().Publish; }
 
         public virtual WaterMeterData WaterMeterData()   { return WaterMeter.WaterMeterData; }
@@ -100,6 +100,13 @@ namespace Results.Entities
         public virtual bool IsDataStream() { return (RegReaderType == (int)RegisterReaderType.DataStream); }
         public virtual bool IsManual()     { return (RegReaderType == (int)RegisterReaderType.Manual); }
 
+        public virtual string PassedOrErrorFlagsStr()
+        {
+            string eFlags = Utils.ErrorFlagsStr(ErrorIndicators);
+            var str = string.IsNullOrEmpty(eFlags) ? PassedColorStr(null) : eFlags;
+            return str;
+        }
+
         public virtual string PassedColorStr(string yesNoFormatOrEmpty)
         {
             if (string.IsNullOrEmpty(yesNoFormatOrEmpty))

Results/Entities/TestRslt.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -147,7 +147,8 @@ namespace Results.Entities
         public virtual int      Counter5            { get; set; }
 
 		/// Wrappers
-		public virtual string Name()		 { return Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
+		public virtual string Name()		 { return Common.Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
+        public virtual string Key()          { return string.Format("{0}~{1}~{2}~{3}", TestData.Name, Part, TestData.Repeats, RepetitionNr); }      /// Unique key
         public virtual int Repeats()         { return TestData.Repeats; }
 		public virtual double Qfrom()		 { return TestData.Qfrom; }
 		public virtual double Qto()			 { return TestData.Qto; }
@@ -158,11 +159,11 @@ namespace Results.Entities
         public virtual string Scale()        { return (Components != null && Components.Scale     != null) ? Components.Scale     : string.Empty; }
         public virtual string Diverter()     { return (Components != null && Components.Diverter  != null) ? Components.Diverter  : string.Empty; }
         public virtual string RegValve()     { return (Components != null && Components.RegValve  != null) ? Components.RegValve  : string.Empty; }
-        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
+        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("StandingStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
         public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest") || TestData.Method.ToLower().Contains("pmax")) : true; }
-        public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; }
+        public virtual bool IsStartStop() { return (MethodClass != null) ? MethodClass.Contains("StandingStart") : true; }
         public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) || MethodClass.Contains("DiverterTest")) : true; }
-        public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
+        public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.StandingStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
 
         public virtual string MethodElde()
         {
@@ -171,9 +172,9 @@ namespace Results.Entities
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionProlonged.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionComparative.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStart.")) return "VS";
-            else if (MethodClass.Contains("TestMethods.FixedStartMassCollection.")) return "MP";
-            else if (MethodClass.Contains("TestMethods.FixedStartTankCollection.")) return "VP";
-            else if (MethodClass.Contains("TestMethods.FixedStart.")) return "VP";
+            else if (MethodClass.Contains("TestMethods.StandingStartMassCollection.")) return "MP";
+            else if (MethodClass.Contains("TestMethods.StandingStartTankCollection.")) return "VP";
+            else if (MethodClass.Contains("TestMethods.StandingStart.")) return "VP";
             else return string.Empty;
         }
 
@@ -229,7 +230,7 @@ namespace Results.Entities
         public virtual float TempLimLo()        { return TestData.TempLimLo; }
         public virtual float TempLimHi()        { return TestData.TempLimHi; }
         public virtual bool Evaluate()          { return TestData.Evaluate; }
-		public virtual Common.Publish Publish() { return (Publish)TestData.Publish; }
+		public virtual Publish Publish()        { return (Publish)TestData.Publish; }
 
 
 		public TestRslt()
@@ -278,7 +279,7 @@ namespace Results.Entities
 		    DensityDiv          = src.DensityDiv;
 		    MassOfEvapWater     = src.MassOfEvapWater;
 		    SpareDbl            = src.SpareDbl;
-		    Flow          = src.Flow;
+		    Flow                = src.Flow;
 		    VolumeCTV           = src.VolumeCTV;
 		    VolumeMaster        = src.VolumeMaster;
 		    ErrorMaster         = src.ErrorMaster;

Results/Entities/WaterMeter.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -117,15 +117,23 @@ namespace Results.Entities
 		///
 		/// Wrappers
 		///
-		public virtual string ProductName()		  { return WaterMeterData.ProductName; }
+        public virtual string GetEndStateAux() { return Compound() ? EndStateAux : string.Empty; }
+        public virtual void   SetEndStateAux(string s) { if (Compound()) EndStateAux = s; }
+
+        public virtual string GetStartState() { return Compound() ? string.Empty : EndStateAux; }
+        public virtual void   SetStartState(string s) { if (!Compound()) EndStateAux = s; }
+
+        public virtual string ProductName()       { return WaterMeterData.ProductName; }
 		public virtual string Producer()		  { return WaterMeterData.Producer; }
 		public virtual string MetrologicalClass() { return WaterMeterData.MetrologicalClass; }
 		public virtual string ApprovalInfo()	  { return WaterMeterData.ApprovalInfo; }
-		public virtual bool   NewQnames()         { return WaterMeterData.NewQnames; }
+		public virtual FlowNames Qnames()         { return (FlowNames)WaterMeterData.Qnames; }
 		public virtual double Q4_Qmax()			  { return WaterMeterData.Q4_Qmax; }
 		public virtual double Q3_Qn()			  { return WaterMeterData.Q3_Qn; }
 		public virtual double Q2_Qt()			  { return WaterMeterData.Q2_Qt; }
 		public virtual double Q1_Qmin()			  { return WaterMeterData.Q1_Qmin; }
+        public virtual double ErrLimHiQ()         { return WaterMeterData.ErrLimHiQ; }
+        public virtual double ErrLimLoQ()         { return WaterMeterData.ErrLimLoQ; }
 
         public virtual bool   Compound()		  { return WaterMeterData.Compound; }
         public virtual bool   HeatMeter()		  { return WaterMeterData.HeatMeter; }

Results/Entities/WaterMeterData.cs

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

Results/Forms/BatchResultsDlg.cs

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

Results/Forms/MoreWMResultsDlg.cs

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

Results/ItemID.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
 ///
 using System;
 

Results/Mappings/BatchMap.cs

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

Results/Mappings/WaterMeterDataMap.cs

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

Results/Output/WMChart.cs

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

Results/Resources/Strings.pl.resx

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

Results/WMeterRsltItemSpec.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -328,7 +328,8 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Scale,              "Scale",          Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Scale())        : string.Empty));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Diverter,           "Diverter",       Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Diverter())     : string.Empty));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.RegValve,           "Reg. valve",     Quantity.String, ItemCategory.TestResult, (w,t,u,f,p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RegValve())     : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E",  Quantity.String, ItemCategory.MeterResult, (w,t,u,f,p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E",   Quantity.String, ItemCategory.MeterResult,(w, t, u, f, p) => (w.GetMeterTestRslt(t) != null) ? FormatStr(f, w.GetMeterTestRslt(t).PassedOrErrorFlagsStr())
+                                                                                                                                                                                          : FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
 
             ///
             /// Water meter info

S640TestApp/App.config

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

S640TestApp/Program.cs

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

S640TestApp/Properties/AssemblyInfo.cs

@@ -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("S640TestApp")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("S640TestApp")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[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("2b84f803-89f3-43cd-9e2d-6ed03de6c3b8")]
+
+// 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("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

S640TestApp/Properties/Resources.Designer.cs

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

S640TestApp/Properties/Resources.resx

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

S640TestApp/Properties/Settings.Designer.cs

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

S640TestApp/Properties/Settings.settings

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

S640TestApp/S640TestApp.csproj

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

S640TestApp/S640TestWnd.Designer.cs

@@ -0,0 +1,207 @@
+namespace S640TestApp
+{
+    partial class S640TestWnd
+    {
+        /// <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.startButton = new System.Windows.Forms.Button();
+            this.endButton = new System.Windows.Forms.Button();
+            this.startCfgButton = new System.Windows.Forms.Button();
+            this.endCfgButton = new System.Windows.Forms.Button();
+            this.procParamsCfgButton = new System.Windows.Forms.Button();
+            this.idWzTypTextBox = new System.Windows.Forms.TextBox();
+            this.idWzTypLabel = new System.Windows.Forms.Label();
+            this.getButton = new System.Windows.Forms.Button();
+            this.baseUrlTextBox = new System.Windows.Forms.TextBox();
+            this.relativeUrlTextBox = new System.Windows.Forms.TextBox();
+            this.relativeUrlLabel = new System.Windows.Forms.Label();
+            this.baseUrlLabel = new System.Windows.Forms.Label();
+            this.getDefaultsGroupBox = new System.Windows.Forms.GroupBox();
+            this.getDefaultsGroupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // startButton
+            // 
+            this.startButton.Location = new System.Drawing.Point(12, 110);
+            this.startButton.Name = "startButton";
+            this.startButton.Size = new System.Drawing.Size(109, 43);
+            this.startButton.TabIndex = 2;
+            this.startButton.Text = "Start";
+            this.startButton.UseVisualStyleBackColor = true;
+            this.startButton.Click += new System.EventHandler(this.startButton_Click);
+            // 
+            // endButton
+            // 
+            this.endButton.Location = new System.Drawing.Point(12, 208);
+            this.endButton.Name = "endButton";
+            this.endButton.Size = new System.Drawing.Size(109, 43);
+            this.endButton.TabIndex = 4;
+            this.endButton.Text = "End";
+            this.endButton.UseVisualStyleBackColor = true;
+            this.endButton.Click += new System.EventHandler(this.endButton_Click);
+            // 
+            // startCfgButton
+            // 
+            this.startCfgButton.Location = new System.Drawing.Point(12, 61);
+            this.startCfgButton.Name = "startCfgButton";
+            this.startCfgButton.Size = new System.Drawing.Size(109, 43);
+            this.startCfgButton.TabIndex = 1;
+            this.startCfgButton.Text = "Configure Start";
+            this.startCfgButton.UseVisualStyleBackColor = true;
+            this.startCfgButton.Click += new System.EventHandler(this.startCfgButton_Click);
+            // 
+            // endCfgButton
+            // 
+            this.endCfgButton.Location = new System.Drawing.Point(12, 159);
+            this.endCfgButton.Name = "endCfgButton";
+            this.endCfgButton.Size = new System.Drawing.Size(109, 43);
+            this.endCfgButton.TabIndex = 3;
+            this.endCfgButton.Text = "Configure End";
+            this.endCfgButton.UseVisualStyleBackColor = true;
+            this.endCfgButton.Click += new System.EventHandler(this.endCfgButton_Click);
+            // 
+            // procParamsCfgButton
+            // 
+            this.procParamsCfgButton.Location = new System.Drawing.Point(12, 12);
+            this.procParamsCfgButton.Name = "procParamsCfgButton";
+            this.procParamsCfgButton.Size = new System.Drawing.Size(109, 43);
+            this.procParamsCfgButton.TabIndex = 0;
+            this.procParamsCfgButton.Text = "Comm. parameters";
+            this.procParamsCfgButton.UseVisualStyleBackColor = true;
+            this.procParamsCfgButton.Click += new System.EventHandler(this.procParamsCfgButton_Click);
+            // 
+            // idWzTypTextBox
+            // 
+            this.idWzTypTextBox.Location = new System.Drawing.Point(87, 75);
+            this.idWzTypTextBox.Name = "idWzTypTextBox";
+            this.idWzTypTextBox.Size = new System.Drawing.Size(53, 20);
+            this.idWzTypTextBox.TabIndex = 5;
+            // 
+            // idWzTypLabel
+            // 
+            this.idWzTypLabel.AutoSize = true;
+            this.idWzTypLabel.Location = new System.Drawing.Point(12, 78);
+            this.idWzTypLabel.Name = "idWzTypLabel";
+            this.idWzTypLabel.Size = new System.Drawing.Size(60, 13);
+            this.idWzTypLabel.TabIndex = 4;
+            this.idWzTypLabel.Text = "ID WZ Typ";
+            // 
+            // getButton
+            // 
+            this.getButton.Location = new System.Drawing.Point(14, 109);
+            this.getButton.Name = "getButton";
+            this.getButton.Size = new System.Drawing.Size(126, 33);
+            this.getButton.TabIndex = 6;
+            this.getButton.Text = "Get";
+            this.getButton.UseVisualStyleBackColor = true;
+            this.getButton.Click += new System.EventHandler(this.getButton_Click);
+            // 
+            // baseUrlTextBox
+            // 
+            this.baseUrlTextBox.Location = new System.Drawing.Point(87, 25);
+            this.baseUrlTextBox.Name = "baseUrlTextBox";
+            this.baseUrlTextBox.Size = new System.Drawing.Size(298, 20);
+            this.baseUrlTextBox.TabIndex = 1;
+            // 
+            // relativeUrlTextBox
+            // 
+            this.relativeUrlTextBox.Location = new System.Drawing.Point(87, 50);
+            this.relativeUrlTextBox.Name = "relativeUrlTextBox";
+            this.relativeUrlTextBox.Size = new System.Drawing.Size(298, 20);
+            this.relativeUrlTextBox.TabIndex = 3;
+            // 
+            // relativeUrlLabel
+            // 
+            this.relativeUrlLabel.AutoSize = true;
+            this.relativeUrlLabel.Location = new System.Drawing.Point(11, 53);
+            this.relativeUrlLabel.Name = "relativeUrlLabel";
+            this.relativeUrlLabel.Size = new System.Drawing.Size(71, 13);
+            this.relativeUrlLabel.TabIndex = 2;
+            this.relativeUrlLabel.Text = "Relative URL";
+            // 
+            // baseUrlLabel
+            // 
+            this.baseUrlLabel.AutoSize = true;
+            this.baseUrlLabel.Location = new System.Drawing.Point(11, 28);
+            this.baseUrlLabel.Name = "baseUrlLabel";
+            this.baseUrlLabel.Size = new System.Drawing.Size(56, 13);
+            this.baseUrlLabel.TabIndex = 0;
+            this.baseUrlLabel.Text = "Base URL";
+            // 
+            // getDefaultsGroupBox
+            // 
+            this.getDefaultsGroupBox.Controls.Add(this.relativeUrlTextBox);
+            this.getDefaultsGroupBox.Controls.Add(this.baseUrlTextBox);
+            this.getDefaultsGroupBox.Controls.Add(this.idWzTypTextBox);
+            this.getDefaultsGroupBox.Controls.Add(this.idWzTypLabel);
+            this.getDefaultsGroupBox.Controls.Add(this.relativeUrlLabel);
+            this.getDefaultsGroupBox.Controls.Add(this.getButton);
+            this.getDefaultsGroupBox.Controls.Add(this.baseUrlLabel);
+            this.getDefaultsGroupBox.Location = new System.Drawing.Point(127, 12);
+            this.getDefaultsGroupBox.Name = "getDefaultsGroupBox";
+            this.getDefaultsGroupBox.Size = new System.Drawing.Size(394, 157);
+            this.getDefaultsGroupBox.TabIndex = 5;
+            this.getDefaultsGroupBox.TabStop = false;
+            this.getDefaultsGroupBox.Text = "Get default Q2 correction factors";
+            // 
+            // S640TestWnd
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(533, 312);
+            this.Controls.Add(this.getDefaultsGroupBox);
+            this.Controls.Add(this.procParamsCfgButton);
+            this.Controls.Add(this.endCfgButton);
+            this.Controls.Add(this.startCfgButton);
+            this.Controls.Add(this.endButton);
+            this.Controls.Add(this.startButton);
+            this.Name = "S640TestWnd";
+            this.Text = "Form1";
+            this.getDefaultsGroupBox.ResumeLayout(false);
+            this.getDefaultsGroupBox.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button startButton;
+        private System.Windows.Forms.Button endButton;
+        private System.Windows.Forms.Button startCfgButton;
+        private System.Windows.Forms.Button endCfgButton;
+        private System.Windows.Forms.Button procParamsCfgButton;
+        private System.Windows.Forms.TextBox idWzTypTextBox;
+        private System.Windows.Forms.Label idWzTypLabel;
+        private System.Windows.Forms.Button getButton;
+        private System.Windows.Forms.TextBox baseUrlTextBox;
+        private System.Windows.Forms.TextBox relativeUrlTextBox;
+        private System.Windows.Forms.Label relativeUrlLabel;
+        private System.Windows.Forms.Label baseUrlLabel;
+        private System.Windows.Forms.GroupBox getDefaultsGroupBox;
+    }
+}
+

S640TestApp/S640TestWnd.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Common;
+using Config;
+using Config.Entities;
+using RestClient;
+using Results.Entities;
+using TBF.Rig.TestMethods.S640Communication;
+
+namespace S640TestApp
+{
+    public partial class S640TestWnd : Form
+    {
+        ProcParams procParams;
+        S640StartCfg startCfg;
+        S640EndCfg endCfg;
+
+        Test test;
+        IList<WaterMeter> waterMeters;
+
+
+        public S640TestWnd()
+        {
+            InitializeComponent();
+
+            baseUrlTextBox.Text = "https://api-operations.sensus-emea.com/core/";
+            relativeUrlTextBox.Text = "metrology/q2correction/Locations/Wztyp/{0}";
+
+            test = new Test()
+            {
+            };
+
+            waterMeters = new List<WaterMeter>();
+            waterMeters.Add(new WaterMeter() { });
+            waterMeters.Add(new WaterMeter() { });
+            waterMeters.Add(new WaterMeter() { });
+        }
+
+        private void procParamsCfgButton_Click(object sender, EventArgs e)
+        {
+            if (procParams == null)
+            {
+                procParams = new ProcParams(true);
+            }
+
+        }
+
+        private void startCfgButton_Click(object sender, EventArgs e)
+        {
+            if (startCfg == null)
+            {
+                startCfg = new S640StartFactory().DefaultConfig() as S640StartCfg;
+            }
+
+            var cfgForm = new TBF.UI.Bench.Components.ComponentParametersDlg(this);
+            var cfgControl = startCfg.GetControl(null);
+            cfgControl.Config = startCfg;
+            cfgControl.Config.ItemNr = 1;
+            cfgForm.ComponentCfgCtrl = cfgControl;
+            cfgForm.UnlockAfterStart = true;
+
+            DialogResult dr = cfgForm.ShowDialog();
+            if (dr == DialogResult.OK)
+            {
+                return;
+            }
+        }
+
+        private void startButton_Click(object sender, EventArgs e)
+        {
+            if (startCfg == null || procParams == null)
+            {
+                MessageBox.Show("Not configured");
+            }
+
+            (new S640CommForm(S640Activity.Start, startCfg, procParams, test, waterMeters)).ShowDialog();
+        }
+
+        private void endCfgButton_Click(object sender, EventArgs e)
+        {
+			if (endCfg == null)
+			{
+				endCfg = new S640EndFactory().DefaultConfig() as S640EndCfg;
+			}
+
+			var cfgForm = new TBF.UI.Bench.Components.ComponentParametersDlg(this);
+            var cfgControl = endCfg.GetControl(null);
+            cfgControl.Config = endCfg;
+            cfgControl.Config.ItemNr = 1;
+            cfgForm.ComponentCfgCtrl = cfgControl;
+			cfgForm.UnlockAfterStart = true;
+
+			DialogResult dr = cfgForm.ShowDialog();
+			if (dr == DialogResult.OK)
+            {
+                return;
+            }
+        }
+
+        private void endButton_Click(object sender, EventArgs e)
+        {
+            if (endCfg == null || procParams == null)
+            {
+                MessageBox.Show("Not configured");
+            }
+
+            (new S640CommForm(S640Activity.End, endCfg, procParams, test, waterMeters)).ShowDialog();
+        }
+
+        private void getButton_Click(object sender, EventArgs e)
+        {
+            string baseUrl = baseUrlTextBox.Text;
+            string relativeUrl = relativeUrlTextBox.Text;
+            int wmType = 0;
+            int q2PreCorrectionLR;
+            int q2PreCorrectionRL;
+
+            if (string.IsNullOrEmpty(baseUrl) || string.IsNullOrEmpty(relativeUrl) ||
+                !int.TryParse(idWzTypTextBox.Text, out wmType) || wmType <= 0)
+            {
+                MessageBox.Show("Invalid parameter(s)");
+                return;
+            }
+
+            /// Get Q2 pre-correction values from REST service
+            try
+            {
+                GetQ2PreCorrectionClient client = new GetQ2PreCorrectionClient(baseUrl);
+                client.GetToken("ReadUser", "sensus",
+                    "https://deluh1web03.world.fluidtechnology.net/SensusCore/api/v1/Locations/1/Login2").Wait();
+                string finalRelativeUrl = string.Format(relativeUrl, wmType);
+                Q2PreCorrection response = client.GetQ2Correction(finalRelativeUrl).Result;
+                if (response != null && response.AreDataCalculated)
+                {
+                    q2PreCorrectionLR = response.CorrLR;
+                    q2PreCorrectionRL = response.CorrRL;
+                    MessageBox.Show(string.Format(
+                        "Q2 corrections from a REST client for WM Type = {0} are: LR = {1}, RL = {2}",
+                        wmType, q2PreCorrectionLR, q2PreCorrectionRL));
+                }
+                else
+                {
+                    MessageBox.Show(string.Format(
+                        "Failed to obtain Q2 corrections from a REST client for WM Type = {0}", wmType));
+                }
+            }
+            catch (Exception exc)
+            {
+                MessageBox.Show(string.Format(
+                    "Failed to obtain Q2 corrections from a REST client for WM Type = {0}: {1}",
+                    wmType, exc.Message));
+            }
+        }
+    }
+}

SharedDatabase/Entities/Batch.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -23,7 +23,9 @@ namespace SharedDatabase.Entities
 		public virtual int UserNumber { get; set; }
 		public virtual string ProcedureName { get; set; }
         public virtual bool IsRemoteProcedure { get; set; }         /// Stara Tura, not mapped to DB
-		public virtual string ProcedureDescription { get; set; }	/// CEVAK, not mapped to DB
+        public virtual string PurchaseOrder { get; set; }           /// Stara Tura, Nanjing, not mapped to DB
+        public virtual string Workflow { get; set; }                /// Stara Tura, Nanjing, not mapped to DB
+        public virtual string ProcedureDescription { get; set; }	/// CEVAK, not mapped to DB
 		public virtual int ProcedureRevision { get; set; }
 		public virtual string WatermetersStr { get; set; }			/// CEVAK, not mapped to DB
         public virtual string Remark { get; set; }
@@ -36,7 +38,8 @@ namespace SharedDatabase.Entities
         public virtual int Counter9 { get; set; }
         public virtual int Counter10 { get; set; }
         public virtual DateTime StartTime { get; set; }
-		public virtual DateTime EndTime { get; set; }
+        public virtual DateTime EndTime { get; set; }
+        public virtual DateTime SaveTime { get; set; }
         public virtual bool Dirty { get; set; }
         public virtual bool RsltsSent { get; set; }
 		public virtual bool RsltsPrinted { get; set; }
@@ -111,6 +114,7 @@ namespace SharedDatabase.Entities
             UserName = string.Empty;
             ProcedureName = string.Empty;
             IsRemoteProcedure = false;
+            PurchaseOrder = null;
             ProcedureDescription = string.Empty;
             WatermetersStr = string.Empty;
             Remark = string.Empty;
@@ -138,6 +142,7 @@ namespace SharedDatabase.Entities
             UserNumber           = oriBatch.UserNumber;
             ProcedureName        = oriBatch.ProcedureName;
             IsRemoteProcedure    = oriBatch.IsRemoteProcedure;
+            PurchaseOrder        = oriBatch.PurchaseOrder;
             ProcedureDescription = oriBatch.ProcedureDescription;
             ProcedureRevision    = oriBatch.ProcedureRevision;
             WatermetersStr       = oriBatch.WatermetersStr;
@@ -152,6 +157,7 @@ namespace SharedDatabase.Entities
             Counter10            = oriBatch.Counter10;
             StartTime            = oriBatch.StartTime;
             EndTime              = oriBatch.EndTime;
+            SaveTime             = oriBatch.SaveTime;
             Dirty                = oriBatch.Dirty;
             RsltsSent            = oriBatch.RsltsSent;
             RsltsPrinted         = oriBatch.RsltsPrinted;
@@ -204,7 +210,7 @@ namespace SharedDatabase.Entities
 
             foreach (var tr in TestRslts)
             {
-                if (tr.TestDone)
+                if (tr.TestDone && tr.AmbTempMean != 0)
                 {
                     double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
                     timeSum += duration;
@@ -222,7 +228,7 @@ namespace SharedDatabase.Entities
 
             foreach (var tr in TestRslts)
             {
-                if (tr.TestDone)
+                if (tr.TestDone && tr.AmbPressMean != 0)
                 {
                     double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
                     timeSum += duration;
@@ -240,7 +246,7 @@ namespace SharedDatabase.Entities
             
             foreach (var tr in TestRslts)
             {
-                if (tr.TestDone)
+                if (tr.TestDone && tr.AmbHumiMean != 0)
                 {
                     double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
                     timeSum += duration;
@@ -255,7 +261,7 @@ namespace SharedDatabase.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Common.Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbTempStart != 0)
                     return TestRslts[i].AmbTempStart;
             }
             return 0;
@@ -264,7 +270,7 @@ namespace SharedDatabase.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Common.Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbPressStart != 0)
                     return TestRslts[i].AmbPressStart;
             }
             return 0;
@@ -273,7 +279,7 @@ namespace SharedDatabase.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Common.Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbHumiStart != 0)
                     return TestRslts[i].AmbHumiStart;
             }
             return 0;
@@ -281,27 +287,27 @@ namespace SharedDatabase.Entities
 
         public virtual double AmbTempEnd()
         {
-            for (int i = TestRslts.Count - 1; i >= 0; i++)
+            for (int i = TestRslts.Count - 1; i >= 0; i--)
             {
-                if (TestRslts[i].Publish() == Common.Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbTempEnd != 0)
                     return TestRslts[i].AmbTempEnd;
             }
             return 0;
         }
         public virtual double AmbPressEnd()
         {
-            for (int i = TestRslts.Count - 1; i >= 0; i++)
+            for (int i = TestRslts.Count - 1; i >= 0; i--)
             {
-                if (TestRslts[i].Publish() == Common.Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbPressEnd != 0)
                     return TestRslts[i].AmbPressEnd;
             }
             return 0;
         }
         public virtual double AmbHumiEnd()
         {
-            for (int i = TestRslts.Count - 1; i >= 0; i++)
+            for (int i = TestRslts.Count - 1; i >= 0; i--)
             {
-                if (TestRslts[i].Publish() == Common.Publish.Always)
+                if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbHumiEnd != 0)
                     return TestRslts[i].AmbHumiEnd;
             }
             return 0;
@@ -318,7 +324,8 @@ namespace SharedDatabase.Entities
 
 		public override string ToString()
 		{
-			return string.Format("Batch #{0}, Start:{1}, End:{2}, Procedure:{3}", BatchNr, StartTime, EndTime, ProcedureName);
+            return string.Format("Batch {0} ({1}s) Start {2}, End {3}, Proc={4}",
+                 BatchNr, (EndTime - StartTime).TotalSeconds, StartTime, EndTime, ProcedureName);
 		}
 
 		public virtual string ToString(int i)
@@ -359,6 +366,7 @@ namespace SharedDatabase.Entities
             writer.Write(Counter10);
             writer.Write(StartTime.ToString());
             writer.Write(EndTime.ToString());
+            writer.Write(SaveTime.ToString());
             writer.Write(Dirty);
             writer.Write(RsltsSent);
             writer.Write(RsltsPrinted);
@@ -425,6 +433,7 @@ namespace SharedDatabase.Entities
             Counter10 = reader.ReadInt32();
             StartTime = DateTime.Parse(reader.ReadString());
             EndTime = DateTime.Parse(reader.ReadString());
+            SaveTime = DateTime.Parse(reader.ReadString());
             Dirty = reader.ReadBoolean();
             RsltsSent = reader.ReadBoolean();
             RsltsPrinted = reader.ReadBoolean();

SharedDatabase/Entities/MeterTestRslt.cs

@@ -63,7 +63,9 @@ namespace SharedDatabase.Entities
 
 		public virtual string ProcedureName() { return WaterMeter.Batch.ProcedureName; }
 		public virtual int    BatchNr()       { return WaterMeter.Batch.BatchNr; }
-		public virtual string SerialNr()	  { return WaterMeter.SerialNr; }
+        public virtual string SerialNr()      { return (CompoundMeterId == (byte)Common.CompoundMeterId.CompoundAux)
+                                                                        ? WaterMeter.SerialNrAux
+                                                                        : WaterMeter.SerialNr; }
 		public virtual string EndState()	  { return WaterMeter.EndState; }
 		public virtual double QRise()		  { return WaterMeter.QRise; }			/// [m3/h]
 		public virtual double QFall()		  { return WaterMeter.QFall; }			/// [m3/h]

SharedDatabase/Entities/Part.cs

@@ -7,7 +7,6 @@ namespace SharedDatabase.Entities
     {
         public virtual int Id { get; protected set; }
         public virtual string Name { get; set; }
-        public virtual string OraDBType { get; set; }
         public virtual string Description { get; set; }
 		public virtual sbyte CodeType { get; set; }
         public virtual sbyte CodeForm { get; set; }
@@ -29,7 +28,6 @@ namespace SharedDatabase.Entities
             Part rslt = new Part();
 
             rslt.Name = Name;
-            rslt.OraDBType = OraDBType;
             rslt.Description = Description;
             rslt.CodeType = CodeType;
             rslt.CodeForm = CodeForm;
@@ -69,7 +67,6 @@ namespace SharedDatabase.Entities
 		public Part(string name, Process workflow, CodeType codeType, CodeForm codeForm, CodeLocation codeLocation)
 		{
             Name = name;
-            OraDBType = string.Empty;
 			Description = string.Empty;
 			CodeType = (sbyte)codeType;
 			CodeForm = (sbyte)codeForm;

SharedDatabase/Entities/TestRslt.cs

@@ -1,10 +1,11 @@
 ///
-/// Copyright (c) 2015-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
+using Common;
 
 namespace SharedDatabase.Entities
 {
@@ -146,8 +147,9 @@ namespace SharedDatabase.Entities
         public virtual int      Counter5            { get; set; }
 
 		/// Wrappers
-		public virtual string Name()		 { return Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
-        public virtual int    Repeats()      { return TestData.Repeats; }
+		public virtual string Name()		 { return Common.Utils.GetTestName(TestData.Name, TestData.Repeats, RepetitionNr); }
+        public virtual string Key()          { return string.Format("{0}~{1}~{2}~{3}", TestData.Name, Part, TestData.Repeats, RepetitionNr); }      /// Unique key
+        public virtual int Repeats()         { return TestData.Repeats; }
 		public virtual double Qfrom()		 { return TestData.Qfrom; }
 		public virtual double Qto()			 { return TestData.Qto; }
 		public virtual double TargetVolume() { return TestData.TargetVolume; }
@@ -157,11 +159,11 @@ namespace SharedDatabase.Entities
         public virtual string Scale()        { return (Components != null && Components.Scale     != null) ? Components.Scale     : string.Empty; }
         public virtual string Diverter()     { return (Components != null && Components.Diverter  != null) ? Components.Diverter  : string.Empty; }
         public virtual string RegValve()     { return (Components != null && Components.RegValve  != null) ? Components.RegValve  : string.Empty; }
-        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
+        public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("StandingStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; }
         public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest") || TestData.Method.ToLower().Contains("pmax")) : true; }
-        public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; }
+        public virtual bool IsStartStop() { return (MethodClass != null) ? MethodClass.Contains("StandingStart") : true; }
         public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) || MethodClass.Contains("DiverterTest")) : true; }
-        public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
+        public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.StandingStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
 
         public virtual string MethodElde()
         {
@@ -170,9 +172,9 @@ namespace SharedDatabase.Entities
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionProlonged.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStartMassCollectionComparative.")) return "MS";
             else if (MethodClass.Contains("TestMethods.FlyingStart.")) return "VS";
-            else if (MethodClass.Contains("TestMethods.FixedStartMassCollection.")) return "MP";
-            else if (MethodClass.Contains("TestMethods.FixedStartTankCollection.")) return "VP";
-            else if (MethodClass.Contains("TestMethods.FixedStart.")) return "VP";
+            else if (MethodClass.Contains("TestMethods.StandingStartMassCollection.")) return "MP";
+            else if (MethodClass.Contains("TestMethods.StandingStartTankCollection.")) return "VP";
+            else if (MethodClass.Contains("TestMethods.StandingStart.")) return "VP";
             else return string.Empty;
         }
 
@@ -224,11 +226,11 @@ namespace SharedDatabase.Entities
             }
         }
 
-		public virtual double ErrLimMargin()  { return TestData.ErrLimMargin; }
-        public virtual float TempLimLo()     { return TestData.TempLimLo; }
-        public virtual float TempLimHi()     { return TestData.TempLimHi; }
-        public virtual bool Evaluate()       { return TestData.Evaluate; }
-		public virtual Common.Publish Publish() { return (Common.Publish)TestData.Publish; }
+		public virtual double ErrLimMargin()    { return TestData.ErrLimMargin; }
+        public virtual float TempLimLo()        { return TestData.TempLimLo; }
+        public virtual float TempLimHi()        { return TestData.TempLimHi; }
+        public virtual bool Evaluate()          { return TestData.Evaluate; }
+		public virtual Publish Publish()        { return (Publish)TestData.Publish; }
 
 
 		public TestRslt()

SharedDatabase/Entities/User.cs

@@ -501,5 +501,10 @@ namespace SharedDatabase.Entities
         {
             return string.Format("{0}~{1}~{2}", UserName, FullName, legalizator);
         }
+
+        public virtual string ToEncodedStr(string _legalizator)
+        {
+            return string.Format("{0}~{1}~{2}", UserName, FullName, _legalizator);
+        }
     }
 }

SharedDatabase/Entities/WaterMeter.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -43,8 +43,9 @@ namespace SharedDatabase.Entities
 	{
         public virtual int Id { get; protected set; }
         public virtual string SerialNr          { get; set; }	/// S/N _or_ S/N of the main meter of a compound meter _or_ PCB Number of an iPerl water meter
-        public virtual string SerialNrAux       { get; set; }	/// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter
-		public virtual string PurchaseOrder		{ get; set; }
+        public virtual string SerialNrAux       { get; set; }	/// S/N of the aux. meter of a compound meter _or_ eRegister PCB Number of a 640 water meter                       
+        public virtual string RadioAddress      { get; set; }
+        public virtual string PurchaseOrder     { get; set; }
 		public virtual int    YearOfProduction  { get; set; }
 		public virtual int    WMPosition        { get; set; }   /// 1-based water meter position
 		public virtual string EndState			{ get; set; }	/// End state (of the main water meter)
@@ -76,7 +77,6 @@ namespace SharedDatabase.Entities
         /// <summary>
         /// Data from a production test bench (in case of tests on iPerl special)
         /// </summary>
-        public virtual string RadioAddress      { get; set; }
         public virtual int    PaletteNr         { get; set; }
         public virtual int    UmkartonNr        { get; set; }
         public virtual string ProdTestBench     { get; set; }
@@ -96,6 +96,7 @@ namespace SharedDatabase.Entities
         public virtual string Prefix            { get; set; }
         public virtual string Suffix            { get; set; }
         public virtual string CompleteSerialNr  { get; set; }
+        public virtual string OriRadioAddress   { get; set; }   /// Not mapped to DB !!!    Original radio address of a 640 water meter (albatrosID)
         public virtual int    WMTypeRevision    { get; set; }
         public virtual int    Pruefindex        { get; set; }	/// >=1 ... pruefindex, 0 ... unknown (no reading from DB yet)
 		public virtual int	  HydrPruefung		{ get; set; }
@@ -108,7 +109,6 @@ namespace SharedDatabase.Entities
         public virtual string Workflow          { get; set; }	/// Not mapped to DB !!!    Production tracing workflow name
         public virtual bool   LastRecordIsNok   { get; set; }	/// Not mapped to DB !!!    Previous record verification result
 
-
         public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
 		public virtual IList<MeterTestRslt> MeterTestRslts { get; set; }
@@ -116,15 +116,23 @@ namespace SharedDatabase.Entities
 		///
 		/// Wrappers
 		///
-		public virtual string ProductName()		  { return WaterMeterData.ProductName; }
+        public virtual string GetEndStateAux() { return Compound() ? EndStateAux : string.Empty; }
+        public virtual void   SetEndStateAux(string s) { if (Compound()) EndStateAux = s; }
+
+        public virtual string GetStartState() { return Compound() ? string.Empty : EndStateAux; }
+        public virtual void   SetStartState(string s) { if (!Compound()) EndStateAux = s; }
+
+        public virtual string ProductName()       { return WaterMeterData.ProductName; }
 		public virtual string Producer()		  { return WaterMeterData.Producer; }
 		public virtual string MetrologicalClass() { return WaterMeterData.MetrologicalClass; }
 		public virtual string ApprovalInfo()	  { return WaterMeterData.ApprovalInfo; }
-		public virtual bool   NewQnames()         { return WaterMeterData.NewQnames; }
+		public virtual FlowNames Qnames()         { return (FlowNames)WaterMeterData.Qnames; }
 		public virtual double Q4_Qmax()			  { return WaterMeterData.Q4_Qmax; }
 		public virtual double Q3_Qn()			  { return WaterMeterData.Q3_Qn; }
 		public virtual double Q2_Qt()			  { return WaterMeterData.Q2_Qt; }
 		public virtual double Q1_Qmin()			  { return WaterMeterData.Q1_Qmin; }
+        public virtual double ErrLimHiQ()         { return WaterMeterData.ErrLimHiQ; }
+        public virtual double ErrLimLoQ()         { return WaterMeterData.ErrLimLoQ; }
 
         public virtual bool   Compound()		  { return WaterMeterData.Compound; }
         public virtual bool   HeatMeter()		  { return WaterMeterData.HeatMeter; }
@@ -439,18 +447,22 @@ namespace SharedDatabase.Entities
 
             Workflow = string.Empty;
             ErrorFlags = 0;
+            InfoFlags = 0;
             LastRecordIsNok = false;
 
             /// Initialize strings
             SerialNr = string.Empty;
             SerialNrAux = string.Empty;
+            RadioAddress = string.Empty;
             PurchaseOrder = string.Empty;
             EndState = string.Empty;
             EndStateAux = string.Empty;
             ArchivePath = string.Empty;
             Remark = string.Empty;
+#if IPERL
+            FWVersion = string.Empty;
+#endif
 #if TURA_SPECIAL
-            RadioAddress = string.Empty;
             ProdUserName = string.Empty;
             ProdPurchaseOrder = string.Empty;
 #endif
@@ -466,6 +478,7 @@ namespace SharedDatabase.Entities
             
             SerialNr           = src.SerialNr;
 		    SerialNrAux        = src.SerialNrAux;
+            RadioAddress       = src.RadioAddress;
 		    PurchaseOrder      = src.PurchaseOrder;
 		    YearOfProduction   = src.YearOfProduction;
             WMPosition         = src.WMPosition;
@@ -494,22 +507,22 @@ namespace SharedDatabase.Entities
 			FWVersion          = src.FWVersion;
 #endif
 #if TURA_SPECIAL
-            RadioAddress = src.RadioAddress;
-            PaletteNr = src.PaletteNr;
-            UmkartonNr = src.UmkartonNr;
-            ProdTestBench = src.ProdTestBench;
-            ProdWMPosition = src.ProdWMPosition;
-            ProdUserName = src.ProdUserName;
-            ProdPurchaseOrder = src.ProdPurchaseOrder;
-            ProdPassed = src.ProdPassed;
-            ProdResultCode = src.ProdResultCode;
-            ProdQ2CorrRL = src.ProdQ2CorrRL;
-            ProdQ2CorrLR = src.ProdQ2CorrLR;
+            PaletteNr          = src.PaletteNr;
+            UmkartonNr         = src.UmkartonNr;
+            ProdTestBench      = src.ProdTestBench;
+            ProdWMPosition     = src.ProdWMPosition;
+            ProdUserName       = src.ProdUserName;
+            ProdPurchaseOrder  = src.ProdPurchaseOrder;
+            ProdPassed         = src.ProdPassed;
+            ProdResultCode     = src.ProdResultCode;
+            ProdQ2CorrRL       = src.ProdQ2CorrRL;
+            ProdQ2CorrLR       = src.ProdQ2CorrLR;
 #endif
             AssignedSerialNr   = src.AssignedSerialNr;
             Prefix             = src.Prefix;
             Suffix             = src.Suffix;
             CompleteSerialNr   = src.CompleteSerialNr;
+            OriRadioAddress    = src.OriRadioAddress;
             WMTypeRevision     = src.WMTypeRevision;
             Pruefindex         = src.Pruefindex;
 		    HydrPruefung       = src.HydrPruefung;
@@ -645,6 +658,7 @@ namespace SharedDatabase.Entities
             writer.Write(Id);
             writer.Write((SerialNr != null) ? SerialNr : string.Empty);
             writer.Write((SerialNrAux != null) ? SerialNrAux : string.Empty);
+            writer.Write((RadioAddress != null) ? RadioAddress : string.Empty);
             writer.Write((PurchaseOrder != null) ? PurchaseOrder : string.Empty);
             writer.Write(YearOfProduction);
             writer.Write(WMPosition);
@@ -673,7 +687,6 @@ namespace SharedDatabase.Entities
             writer.Write((FWVersion != null) ? FWVersion : string.Empty);
 #endif
 #if TURA_SPECIAL
-            writer.Write((RadioAddress != null) ? RadioAddress : string.Empty);
             writer.Write(PaletteNr);
             writer.Write(UmkartonNr);
             writer.Write((ProdTestBench != null) ? ProdTestBench : string.Empty);
@@ -689,6 +702,7 @@ namespace SharedDatabase.Entities
             writer.Write((Prefix != null) ? Prefix : string.Empty);
             writer.Write((Suffix != null) ? Suffix : string.Empty);
             writer.Write((CompleteSerialNr != null) ? CompleteSerialNr : string.Empty);
+            writer.Write((OriRadioAddress != null) ? OriRadioAddress : string.Empty);
             writer.Write(WMTypeRevision);
             writer.Write(Pruefindex);
             writer.Write(HydrPruefung);
@@ -738,6 +752,7 @@ namespace SharedDatabase.Entities
             Id = reader.ReadInt32();
             SerialNr = reader.ReadString();
             SerialNrAux = reader.ReadString();
+            RadioAddress = reader.ReadString();
             PurchaseOrder = reader.ReadString();
             YearOfProduction = reader.ReadInt32();
             WMPosition = reader.ReadInt32();
@@ -766,7 +781,6 @@ namespace SharedDatabase.Entities
             FWVersion = reader.ReadString();
 #endif
 #if TURA_SPECIAL
-            RadioAddress = reader.ReadString();
             PaletteNr = reader.ReadInt32();
             UmkartonNr = reader.ReadInt32();
             ProdTestBench = reader.ReadString();
@@ -782,6 +796,7 @@ namespace SharedDatabase.Entities
             Prefix = reader.ReadString();
             Suffix = reader.ReadString();
             CompleteSerialNr = reader.ReadString();
+            OriRadioAddress = reader.ReadString();
             WMTypeRevision = reader.ReadInt32();
             Pruefindex = reader.ReadInt32();
             HydrPruefung = reader.ReadInt32();

SharedDatabase/Entities/WaterMeterData.cs

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

SharedDatabase/Enums.cs

@@ -15,15 +15,15 @@ namespace SharedDatabase
 
     public enum CodeType
     {
-        [Description("")]        UniqueNr                  = 0,       
-        [Description("Sap6-8")]  FlowtubeNr                = 1,   /// prvé 3 znaky sa zhodujú s poslednými 3 znakmi názvu
-        [Description("FT-20")]   FlowtubeNrLU              = 2,   /// začiatok kódu sa zhoduje s názvom
-        [Description("1")]       BatchNr                   = 3,
-        [Description("2")]       BatchNrContainingPartName = 4,
-        [Description("3")]       DateMMYY                  = 5,
-        [Description("4")]       QualityCheck              = 6,
-        [Description("Obj.")]    PO                        = 7,   /// Purchase order from Oracle table VT_AUFTRAG_PD
-        [Description("Silicon")] Silicon                   = 8,
+        [Description("No check")]                                  UniqueNr                  = 0,       
+        [Description("8-chars, first 3 ch = last 3 ch of SAP nr")] FlowtubeNr                = 1,   /// prvé 3 znaky sa zhodujú s poslednými 3 znakmi názvu
+        [Description("20-chars, first 8 ch = SAP nr")]             FlowtubeNrLU              = 2,   /// začiatok kódu sa zhoduje s názvom
+        [Description("Batch number")]                              BatchNr                   = 3,
+        [Description("Batch number containing part SAP nr")]       BatchNrContainingPartName = 4,
+        [Description("Month in form MMYY, 4 digits")]              DateMMYY                  = 5,
+        [Description("Quality check")]                             QualityCheck              = 6,
+        [Description("Valid purchase order from a DB")]            PO                        = 7,   /// Purchase order from OrderInfo table of MySQL DB or from VT_AUFTRAG_PD table of Oracle DB
+        [Description("Silicon")]                                   Silicon                   = 8,
                 /// 1. change requires special password
                 /// 2. do not clear
                 /// 3. save locally
@@ -33,17 +33,17 @@ namespace SharedDatabase
 
     public enum CodeForm
     {
-        Barcode     = 0,        /// Barcode
-        QRCode      = 1,        /// QR code
-		Keyboard    = 2,        /// Data entered by a keyboard
-		OkNok       = 3,        /// OK/NOK or Yes/No data entered by a keyboard or a mouse
-        SerialNr    = 4,        /// Complete serial number of iPERL (follows PcbNumber which is a reference part)
-        Camera      = 5,
-        Scale       = 6,
-        SNGenerator = 7,
-        DataStream  = 8,
-        Spare2      = 9,
-        Spare3      = 10,
+        [Description("Barcode scanner")]       Barcode     = 0,        /// Barcode
+        [Description("QR code scanner")]       QRCode      = 1,        /// QR code
+		[Description("Keyboard")]              Keyboard    = 2,        /// Data entered by a keyboard
+		[Description("OK/NOK manual entry")]   OkNok       = 3,        /// OK/NOK or Yes/No data entered by a keyboard or a mouse
+        [Description("Complete S/N from DB")]  SerialNr    = 4,        /// Complete serial number of iPERL (follows PcbNumber which is a reference part)
+        [Description("Camera")]                Camera      = 5,
+        [Description("Scale (mass)")]          Scale       = 6,
+        [Description("S/N generator/printer")] SNGenerator = 7,
+        [Description("S640 datastream")]       DataStream  = 8,
+        [Description("(spare 2)")]             Spare2      = 9,
+        [Description("(spare 3)")]             Spare3      = 10,
         Count
     }
 

SharedDatabase/Forms/LoginDlg.cs

@@ -79,7 +79,7 @@ namespace SharedDatabase.Forms
 #if DEBUG
             user = "milan";
             userNameTextBox.Text = "milan";
-            passwordTextBox.Text = "kremik";
+            passwordTextBox.Text = "kraken";
 #endif
         }
 

SharedDatabase/Forms/PlainLoginDlg.Designer.cs

@@ -0,0 +1,112 @@
+///
+/// Copyright (c) 2022 Sensus Slovensko a.s.
+///
+namespace SharedDatabase.Forms
+{
+    partial class PlainLoginDlg
+    {
+        /// <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(PlainLoginDlg));
+            this.userNameLabel = new System.Windows.Forms.Label();
+            this.passwordLabel = new System.Windows.Forms.Label();
+            this.passwordTextBox = new System.Windows.Forms.TextBox();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.okButton = new System.Windows.Forms.Button();
+            this.userNameTextBox = new System.Windows.Forms.TextBox();
+            this.SuspendLayout();
+            // 
+            // aliasLabel
+            // 
+            resources.ApplyResources(this.userNameLabel, "aliasLabel");
+            this.userNameLabel.Name = "aliasLabel";
+            // 
+            // passwordLabel
+            // 
+            resources.ApplyResources(this.passwordLabel, "passwordLabel");
+            this.passwordLabel.Name = "passwordLabel";
+            // 
+            // passwordTextBox
+            // 
+            resources.ApplyResources(this.passwordTextBox, "passwordTextBox");
+            this.passwordTextBox.Name = "passwordTextBox";
+            this.passwordTextBox.UseSystemPasswordChar = true;
+            this.passwordTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.passwordTextBox_KeyPress);
+            // 
+            // cancelButton
+            // 
+            resources.ApplyResources(this.cancelButton, "cancelButton");
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+            // 
+            // okButton
+            // 
+            resources.ApplyResources(this.okButton, "okButton");
+            this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.okButton.Name = "okButton";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // userNameTextBox
+            // 
+            resources.ApplyResources(this.userNameTextBox, "userNameTextBox");
+            this.userNameTextBox.Name = "userNameTextBox";
+            this.userNameTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.userNameTextBox_KeyPress);
+            // 
+            // PlainLoginDlg
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.cancelButton;
+            this.Controls.Add(this.userNameTextBox);
+            this.Controls.Add(this.okButton);
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.passwordTextBox);
+            this.Controls.Add(this.passwordLabel);
+            this.Controls.Add(this.userNameLabel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Name = "PlainLoginDlg";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PlainLoginDlg_FormClosing);
+            this.Load += new System.EventHandler(this.LoginDlg_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label userNameLabel;
+        private System.Windows.Forms.Label passwordLabel;
+        private System.Windows.Forms.TextBox userNameTextBox;
+        private System.Windows.Forms.TextBox passwordTextBox;
+        private System.Windows.Forms.Button cancelButton;
+        private System.Windows.Forms.Button okButton;
+    }
+}

SharedDatabase/Forms/PlainLoginDlg.cs

@@ -0,0 +1,315 @@
+///
+/// Copyright (c) 2022 Sensus Slovensko a.s.
+///
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using log4net;
+using Common;
+using GemCard;
+using SharedDatabase.Entities;
+using SharedDatabase.Resources;
+
+namespace SharedDatabase.Forms
+{
+    /// <summary>
+    /// Provides login dialog as well as user authorization using TBF.User.Authorize(...)
+    /// (i.e. when DialogResult is OK, user was authorized).
+    /// </summary>
+    public partial class PlainLoginDlg : Form
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(PlainLoginDlg));
+
+        ///  Public readonly
+        public string UserName { get { return user; } }
+        public string FullName { get { return fullName; } }
+
+        /// Private fields
+        string user;
+        string password;
+        GID[] requiredGroupMembership;
+        bool noDatabase;
+        Color oriBackColor;
+        string fullName;     /// Description of the selected user
+
+        /// Smart card support, card S/N is used as user.Tag
+        CardNative card;
+        string smartCardReader;
+
+		public LoginMethod Method;
+		public string VersionString;
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public PlainLoginDlg()
+        {
+            InitializeComponent();
+
+            oriBackColor = BackColor;
+        }
+
+        /// <summary>
+        /// Constructor with a predefined user.
+        /// </summary>
+        public PlainLoginDlg(string predefinedUser, string prompt = null)
+            : this()
+        {
+            user = predefinedUser;
+            userNameTextBox.Text = predefinedUser;
+            if (prompt != null) Text = prompt;
+        }
+
+		/// <summary>
+		/// Constructor with 'no Database' flag.
+		/// </summary>
+        public PlainLoginDlg(bool noDatabase, string prompt = null)
+			: this()
+		{
+			this.noDatabase = noDatabase;
+            if (prompt != null) Text = prompt;
+		}
+
+        /// <summary>
+        /// Constructor when a specific group membership is required.
+        /// </summary>
+        public PlainLoginDlg(GID[] requiredGroupMembership, string prompt = null)
+            : this()
+        {
+            this.requiredGroupMembership = requiredGroupMembership;
+            if (prompt != null) Text = prompt;
+        }
+
+        /// <summary>
+        /// Constructor with a predefined user when a specific group membership is required.
+        /// </summary>
+        public PlainLoginDlg(string predefinedUser, GID[] requiredGroupMembership, string prompt = null)
+            : this()
+        {
+            user = predefinedUser;
+            userNameTextBox.Text = predefinedUser;
+            this.requiredGroupMembership = requiredGroupMembership;
+
+            Text = (prompt != null) ? prompt : Strings.User_Login + (string.IsNullOrEmpty(VersionString) ? "" : (" " + VersionString));
+        }
+
+        private void LoginDlg_Load(object sender, EventArgs e)
+        {
+			Localize();
+            
+			if (user == null)
+				userNameTextBox.Select();
+            else
+				passwordTextBox.Select();
+
+			///
+			/// Smart card reader detection
+			///
+            smartCardReader = null;             /// null = No smart card reader detected
+
+#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
+            try
+            {
+                card = new CardNative();
+
+                /// Find NFC smart card reader
+                string[] cardReaders = card.ListReaders();
+                if (cardReaders != null)
+                {
+                    foreach (var crd in cardReaders)
+                    {
+                        log.WarnFormat("SMART card reader found: {0}", crd);
+                    }
+
+                    foreach (var crd in cardReaders)
+                    {
+                        if (crd.Contains("NFC"))
+                        {
+                            log.ErrorFormat("SMART card reader selected: {0}", crd);
+                            smartCardReader = crd;  /// NFC smart card reader detected
+                            break;
+                        }
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(smartCardReader))
+                {
+                    /// Reader found, initialize NFC smart card reader
+
+                    card.OnCardInserted += delegate(object sndr, CardInsertedEventArgs args)
+                    {
+                        if (InvokeRequired) { Invoke(new EventHandler<CardInsertedEventArgs>(OnCardInserted), sndr, args); }
+                        else OnCardInserted(sndr, args);
+                    };
+
+                    card.OnCardRemoved += delegate(object sndr, CardRemovedEventArgs args)
+                    {
+                        if (InvokeRequired) { Invoke(new EventHandler<CardRemovedEventArgs>(OnCardRemoved), sndr, args); }
+                        else OnCardRemoved(sndr, args);
+                    };
+
+                    card.StartCardEvents(smartCardReader);
+
+                    Text += " (NFC)";
+                }
+            }
+            catch (Exception)
+            {
+                smartCardReader = null;
+            }
+#endif
+        }
+
+		void Localize()
+		{
+            userNameLabel.Text = Strings.User_name;
+			passwordLabel.Text = Strings.Password;
+			okButton.Text = Strings.OkBtnText;
+			cancelButton.Text = Strings.CancelBtnText;
+		}
+
+        /// <summary>
+        /// Try to authorize the user when OK clicked.
+        /// </summary>
+        private void okButton_Click(object sender, EventArgs e)
+        {
+            user = userNameTextBox.Text;
+            password = passwordTextBox.Text;
+
+            bool authorized = Common.Utils.IsPowerUser(user, password);
+            if (authorized) fullName = "Power user";
+
+			if (!authorized && !noDatabase)
+			{
+				DBSettings[] dbs = new DBSettings[] { CurrentUser.RemoteUsersDB, CurrentUser.LocalUsersDB };
+
+				foreach (var db in dbs)
+				{
+                    try
+                    {
+                        var usr1 = Entities.User.LoadUserByName(user, db);
+
+                        if (usr1.IsMemberOf(requiredGroupMembership) && usr1.IsCorrectPassword(password))
+                        {
+                            authorized = true;
+                            fullName = usr1.FullName;
+                            break;
+                        }
+                    }
+                    catch (Exception) { }
+				}
+			}
+
+			if (authorized)
+			{
+				DialogResult = DialogResult.OK;
+				Close();
+				return;
+			}
+
+            MessageBox.Show(Strings.Invalid_username_or_password, Strings.Error, MessageBoxButtons.OK);
+            DialogResult = DialogResult.None;
+            return;
+        }
+
+        /// <summary>
+        /// Cancel clicked, do not try to authorize.
+        /// </summary>
+        private void cancelButton_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+            return;
+        }
+
+        private void userNameTextBox_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (Convert.ToInt32(e.KeyChar) == 13)
+            {
+                passwordTextBox.Focus();
+            }
+        }
+
+        private void passwordTextBox_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (Convert.ToInt32(e.KeyChar) == 13)
+            {
+                okButton_Click(sender, e);
+            }
+        }
+
+
+        void OnCardInserted(object sender, CardInsertedEventArgs args)
+        {
+            string tag = string.Empty;
+
+            try
+            {
+                BackColor = Color.Green;
+                card.Connect(smartCardReader, SHARE.Shared, PROTOCOL.T0orT1);
+
+                /// Read the serial number of the card
+                APDUResponse response = card.Transmit(new APDUCommand(0xFF, 0xCA, 0x00, 0x00, null, 7));
+                tag = response.ToString();
+
+                card.Disconnect(DISCONNECT.Leave);
+            }
+            catch
+            {
+                tag = string.Empty;
+            }
+
+            DBSettings[] dbs = new DBSettings[] { CurrentUser.RemoteUsersDB, CurrentUser.LocalUsersDB };
+            bool authorized = false;
+            AuthorizedAs authorizedAs = AuthorizedAs.RemoteUser;
+            ///
+            foreach (var db in dbs)
+            {
+                try
+                {
+                    Entities.User loadedUser = Entities.User.LoadUserByTag(tag, db);
+                    if (loadedUser != null)
+                    {
+                        authorized = (tag == loadedUser.Tag && loadedUser.IsMemberOf(requiredGroupMembership));
+
+                        if (authorized)
+                        {
+                            user = loadedUser.UserName;
+                            break;
+                        }
+                    }
+                }
+                catch (Exception) { }
+
+                authorizedAs = AuthorizedAs.LocalUser;
+            }
+
+            if (authorized)
+            {
+                CurrentUser.AuthorizedAs = authorizedAs;
+                DialogResult = DialogResult.OK;
+                Close();
+                return;
+            }
+
+            MessageBox.Show(Strings.Invalid_username_or_password, Strings.Error, MessageBoxButtons.OK);
+            DialogResult = DialogResult.None;
+            return;
+        }
+
+
+        void OnCardRemoved(object sender, CardRemovedEventArgs args)
+        {
+            BackColor = oriBackColor;
+        }
+
+        private void PlainLoginDlg_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(smartCardReader))
+            {
+                try { card.StopCardEvents(); }
+                catch { }
+            }
+        }
+    }
+}

SharedDatabase/Forms/PlainLoginDlg.resx

@@ -0,0 +1,300 @@
+<?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>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="aliasLabel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="aliasLabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 24</value>
+  </data>
+  <data name="aliasLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>58, 13</value>
+  </data>
+  <data name="aliasLabel.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="aliasLabel.Text" xml:space="preserve">
+    <value>User name</value>
+  </data>
+  <data name="&gt;&gt;aliasLabel.Name" xml:space="preserve">
+    <value>aliasLabel</value>
+  </data>
+  <data name="&gt;&gt;aliasLabel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;aliasLabel.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;aliasLabel.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="passwordLabel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="passwordLabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 51</value>
+  </data>
+  <data name="passwordLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 13</value>
+  </data>
+  <data name="passwordLabel.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="passwordLabel.Text" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="&gt;&gt;passwordLabel.Name" xml:space="preserve">
+    <value>passwordLabel</value>
+  </data>
+  <data name="&gt;&gt;passwordLabel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;passwordLabel.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;passwordLabel.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="passwordTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="passwordTextBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>150, 48</value>
+  </data>
+  <data name="passwordTextBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 20</value>
+  </data>
+  <data name="passwordTextBox.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;passwordTextBox.Name" xml:space="preserve">
+    <value>passwordTextBox</value>
+  </data>
+  <data name="&gt;&gt;passwordTextBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;passwordTextBox.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;passwordTextBox.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="cancelButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="cancelButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>336, 48</value>
+  </data>
+  <data name="cancelButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>105, 28</value>
+  </data>
+  <data name="cancelButton.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="cancelButton.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="&gt;&gt;cancelButton.Name" xml:space="preserve">
+    <value>cancelButton</value>
+  </data>
+  <data name="&gt;&gt;cancelButton.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cancelButton.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cancelButton.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="okButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>336, 14</value>
+  </data>
+  <data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>105, 28</value>
+  </data>
+  <data name="okButton.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="okButton.Text" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="&gt;&gt;okButton.Name" xml:space="preserve">
+    <value>okButton</value>
+  </data>
+  <data name="&gt;&gt;okButton.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;okButton.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="userNameTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="userNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>150, 22</value>
+  </data>
+  <data name="userNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 20</value>
+  </data>
+  <data name="userNameTextBox.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;userNameTextBox.Name" xml:space="preserve">
+    <value>userNameTextBox</value>
+  </data>
+  <data name="&gt;&gt;userNameTextBox.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;userNameTextBox.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;userNameTextBox.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>456, 88</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterScreen</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>User login</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>LoginDlg</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>

SharedDatabase/ItemID.cs

@@ -22,7 +22,7 @@ namespace SharedDatabase
         Test_start_time,                /// 12
         Test_end_time,                  /// 13
         Test_time,                      /// 14
-        Flow,                           /// 15
+        Flow,                           /// 15 Calculated flow (use ConstMasterRaw/ConstMaster to calculate uncorrected flow of the reference flow meter)
         T_up_mean,                      /// 16
         T_down_mean,                    /// 17
         T_div,                          /// 18
@@ -332,6 +332,19 @@ namespace SharedDatabase
         Diverter,                       /// 281
         RegValve,                       /// 282
 
+        X1,                             /// 283
+        X2,                             /// 284
+        X3,                             /// 285
+        X4,                             /// 286
+        X5,                             /// 287
+        X6,                             /// 288
+        X7,                             /// 289
+        X8,                             /// 290
+        X9,                             /// 291
+
+        RadioAddress,                   /// 292
+        OriRadioAddress,                /// 293
+
         Count,
     }
 }

SharedDatabase/Mappings/BatchMap.cs

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

SharedDatabase/Mappings/PartMap.cs

@@ -8,7 +8,6 @@ namespace SharedDatabase.Mappings
         {
             Id(x => x.Id);
             Map(x => x.Name);
-            Map(x => x.OraDBType);
             Map(x => x.Description);
 			Map(x => x.CodeType);
             Map(x => x.CodeForm);

SharedDatabase/Mappings/TestRsltMap.cs

@@ -2,17 +2,18 @@
 /// Copyright (c) 2015-2022 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
+using SharedDatabase.Entities;
 
 namespace SharedDatabase.Mappings
 {
-    class TestRsltMap : ClassMap<Entities.TestRslt>
+	class TestRsltMap : ClassMap<TestRslt>
 	{
 		public TestRsltMap()
 		{
 			Id(x => x.Id);
-			References<Entities.Batch>(x => x.Batch);
-			References<Entities.TestData>(x => x.TestData);
-			References<Entities.Components>(x => x.Components);
+			References<Batch>(x => x.Batch);
+			References<TestData>(x => x.TestData);
+			References<Components>(x => x.Components);
 			Map(x => x.Part);
 			Map(x => x.RepetitionNr);
             Map(x => x.MethodClass);

SharedDatabase/Mappings/WaterMeterDataMap.cs

@@ -1,11 +1,12 @@
 ///
-/// Copyright (c) 2015-2017 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
+using SharedDatabase.Entities;
 
 namespace SharedDatabase.Mappings
 {
-    class WaterMeterDataMap : ClassMap<Entities.WaterMeterData>
+	class WaterMeterDataMap : ClassMap<WaterMeterData>
 	{
 		public WaterMeterDataMap()
 		{
@@ -17,13 +18,13 @@ namespace SharedDatabase.Mappings
             Map(x => x.L);
             Map(x => x.Mounting);
 
-#if MUNICH && LANG_DE
-			Map(x => x.NewQnames);
-#endif
+			Map(x => x.Qnames);
             Map(x => x.Q4_Qmax);
 			Map(x => x.Q3_Qn);
 			Map(x => x.Q2_Qt);
 			Map(x => x.Q1_Qmin);
+            Map(x => x.ErrLimHiQ);
+            Map(x => x.ErrLimLoQ);
 
             Map(x => x.MetrologicalClass);
             Map(x => x.TemperatureClass);

SharedDatabase/Mappings/WaterMeterMap.cs

@@ -1,18 +1,20 @@
 ///
-/// Copyright (c) 2015-2017 Sensus Metering Systems
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
+using SharedDatabase.Entities;
 
 namespace SharedDatabase.Mappings
 {
-    class WaterMeterMap : ClassMap<Entities.WaterMeter>
+	class WaterMeterMap : ClassMap<WaterMeter>
 	{
 		public WaterMeterMap()
 		{
 			Id(x => x.Id);
 			Map(x => x.SerialNr);
 			Map(x => x.SerialNrAux);
-			Map(x => x.PurchaseOrder);
+            Map(x => x.RadioAddress);
+            Map(x => x.PurchaseOrder);
 			Map(x => x.YearOfProduction);
 			Map(x => x.WMPosition);
 			Map(x => x.EndState);
@@ -42,7 +44,6 @@ namespace SharedDatabase.Mappings
 			Map(x => x.FWVersion);
 #endif
 #if TURA_SPECIAL
-            Map(x => x.RadioAddress);
             Map(x => x.PaletteNr);
             Map(x => x.UmkartonNr);
             Map(x => x.ProdTestBench);
@@ -59,9 +60,10 @@ namespace SharedDatabase.Mappings
             Map(x => x.Prefix);
             Map(x => x.Suffix);
             Map(x => x.CompleteSerialNr);
+            Map(x => x.OriRadioAddress);
+            Map(x => x.WMTypeRevision);
             Map(x => x.Pruefindex);
             Map(x => x.HydrPruefung);
-            Map(x => x.WMTypeRevision);
 #endif
             References(x => x.WaterMeterData);
 			References(x => x.Batch);

SharedDatabase/Resources/Strings.Designer.cs

@@ -115,7 +115,7 @@ namespace SharedDatabase.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to calibration specialist.
+        ///   Looks up a localized string similar to legalizator.
         /// </summary>
         internal static string calibration_specialist {
             get {

SharedDatabase/Resources/Strings.resx

@@ -157,7 +157,7 @@
     <value>Are you sure?</value>
   </data>
   <data name="calibration_specialist" xml:space="preserve">
-    <value>calibration specialist</value>
+    <value>legalizator</value>
   </data>
   <data name="CancelBtnText" xml:space="preserve">
     <value>Cancel</value>

SharedDatabase/SharedDatabase.csproj

@@ -102,6 +102,12 @@
     <Compile Include="Forms\PasswordChangeDlg.designer.cs">
       <DependentUpon>PasswordChangeDlg.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\PlainLoginDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\PlainLoginDlg.Designer.cs">
+      <DependentUpon>PlainLoginDlg.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\TripleLoginDlg.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -187,6 +193,9 @@
     <EmbeddedResource Include="Forms\PasswordChangeDlg.resx">
       <DependentUpon>PasswordChangeDlg.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\PlainLoginDlg.resx">
+      <DependentUpon>PlainLoginDlg.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\TripleLoginDlg.resx">
       <DependentUpon>TripleLoginDlg.cs</DependentUpon>
     </EmbeddedResource>

SharedDatabase/Utils.cs

@@ -12,7 +12,7 @@ namespace SharedDatabase
 	{
 		public static string GetTestName(string name, int repeats, int repetitionNr)
 		{
-            return SharedDatabase.Utils.GetTestName(name, repeats, repetitionNr);
+            return Common.Utils.GetTestName(name, repeats, repetitionNr);
 		}
 
         public static System.Drawing.Color GetSeverityColor(Common.Severity severity, bool foreColor = false)
@@ -40,6 +40,8 @@ namespace SharedDatabase
                 case 10: return 38;  /// WR14
                 case 11: return 39;  /// WR18
                 case 12: return 40;  /// WR19
+                case 13: return 41;  /// WR20
+                case 14: return 42;  /// WR21
                 default: return 0;
             }
         }
@@ -57,6 +59,8 @@ namespace SharedDatabase
                 case 10: return "WR14";
                 case 11: return "WR18";
                 case 12: return "WR19";
+                case 13: return "WR20";
+                case 14: return "WR21";
                 default: return string.Empty;
             }
         }

TBF.sln

@@ -96,6 +96,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenericTest", "GenericTest\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductionTracing", "ProductionTracing\ProductionTracing.csproj", "{328AD6D5-6E62-42FB-B348-9899F813DBD3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "S640TestApp", "S640TestApp\S640TestApp.csproj", "{EE097B5A-8162-45B1-9643-4969FC3A8921}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -420,6 +422,16 @@ Global
 		{328AD6D5-6E62-42FB-B348-9899F813DBD3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{328AD6D5-6E62-42FB-B348-9899F813DBD3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{328AD6D5-6E62-42FB-B348-9899F813DBD3}.Release|x86.ActiveCfg = Release|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EE097B5A-8162-45B1-9643-4969FC3A8921}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TBF/CameraBinaryFiles2/hrlivestream.sh

@@ -0,0 +1 @@
+/opt/vc/bin/raspivid -o - -t 0 | /usr/bin/cvlc stream:///dev/stdin --sout "#rtp{sdp=rtsp://:8554/}" :demux=h264

TBF/CameraBinaryFiles2/livestream.sh

@@ -0,0 +1 @@
+/opt/vc/bin/raspivid -w 640 -h 480 -fps 30 -o - -t 0 | /usr/bin/cvlc stream:///dev/stdin --sout "#rtp{sdp=rtsp://:8554/}" :demux=h264

TBF/CameraBinaryFiles2/mjpegrtpstream.sh

@@ -0,0 +1,2 @@
+/opt/vc/bin/raspivid -t 0 -cd MJPEG -w 1280 -h 960 -fps 30 -b 8000000 -o - | gst-launch-1.0 fdsrc ! "image/jpeg,framerate=40/1" ! jpegparse ! rtpjpegpay ! udpsink host=192.168.0.200 port=20000
+

TBF/LocalSettings.cs

@@ -245,6 +245,27 @@ namespace TBF
         public string LastText3;
         public string LastRemark;
 
+        /// DataEntry.Uni history
+        public string[] LastBgComm1;
+        public string[] LastBgComm2;
+        public string[] LastBgComm3;
+        /// 
+        public string[] LastBgColA;
+        public string[] LastBgColB;
+        public string[] LastBgColC;
+        public string[] LastBgColD;
+        public string[] LastBgColE;
+        /// 
+        public string[] LastEnComm1;
+        public string[] LastEnComm2;
+        public string[] LastEnComm3;
+        /// 
+        public string[] LastEnColA;
+        public string[] LastEnColB;
+        public string[] LastEnColC;
+        public string[] LastEnColD;
+        public string[] LastEnColE;
+
 		/// Purchase order history
 		public string[] PurchaseOrderHistory;
 		[XmlIgnore]

TBF/Program.cs

@@ -1,9 +1,10 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Windows.Forms;
 using log4net;
 using Common;
@@ -228,6 +229,8 @@ namespace TBF
             bool retryLogin = true;         /// true = stay in a login loop
             do
 			{
+                LoadingConfigEnd();
+
                 LoginDlgWithBenchSelection loginDlgBench;
                 if (LocalSettings.LastBenchName != null)
                 {
@@ -252,6 +255,7 @@ namespace TBF
                         {
 							log.FatalFormat("Test bench name: {0}", loginDlgBench.BenchName);
 
+                            LoadingConfigStart();
 							CurrentUser.RemoteUsersDB = LocalSettings.TestBenches[i].UsersDBSettings;
 							CurrentUser.LocalUsersDB = LocalSettings.TestBenches[i].ProceduresDBSettings;
 
@@ -488,11 +492,12 @@ namespace TBF
 
 			try
 			{
-				/// Open the main application window
+                /// Open the main application window
 				log.Info("Creating the main window");
 				MainWnd = new UI.MainWnd();
 				log.Info("Opening the main window");
-				Application.Run(MainWnd);
+                LoadingConfigEnd();
+                Application.Run(MainWnd);
 				log.Info("The main window was closed");
 			}
 			catch (Exception e)
@@ -527,5 +532,35 @@ namespace TBF
 			log.FatalFormat("StackTrace   : {0}{1}", Environment.NewLine, e.StackTrace);
 			log.Fatal("--------------------------------------");
 		}
+
+
+        static UI.Shared.ModelessActivityForm form;
+        static System.Threading.Thread formThread;
+
+        static void LoadingConfigStart()
+        {
+            form = new UI.Shared.ModelessActivityForm()
+            {
+                Message = Strings.Starting_system,
+                FontFamily = "Arial",
+                FontSize = 24,
+                FontStyle = FontStyle.Regular,
+                BackgroundColor = Color.LightBlue,
+            };
+            formThread = new System.Threading.Thread(() => form.ShowDialog());
+            formThread.Start();
+            System.Threading.Thread.Sleep(500);
+        }
+
+        static void LoadingConfigEnd()
+        {
+            if (form != null && formThread != null)
+            {
+                form.CloseForm(null, new EventArgs());
+                formThread.Join();
+            }
+            form = null;
+            formThread = null;
+        }
 	}
 }

TBF/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("TestBenchFramework")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2022 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2023 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.1973.0")]
-[assembly: AssemblyFileVersion("3.3.1973.0")]
+[assembly: AssemblyVersion("3.6.2086.0")]
+[assembly: AssemblyFileVersion("3.6.2086.0")]

TBF/Resources/Strings.Designer.cs

@@ -357,6 +357,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to any profile.
+        /// </summary>
+        internal static string any_profile {
+            get {
+                return ResourceManager.GetString("any_profile", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Approval.
         /// </summary>
@@ -1302,6 +1311,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to default printer.
+        /// </summary>
+        internal static string default_printer {
+            get {
+                return ResourceManager.GetString("default_printer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Default units.
         /// </summary>
@@ -3372,6 +3390,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to no profile.
+        /// </summary>
+        internal static string no_profile {
+            get {
+                return ResourceManager.GetString("no_profile", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to No results to print.
         /// </summary>
@@ -3912,6 +3939,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Print.
+        /// </summary>
+        internal static string Print {
+            get {
+                return ResourceManager.GetString("Print", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Print again.
         /// </summary>
@@ -3975,6 +4011,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Printer selection.
+        /// </summary>
+        internal static string Printer_selection {
+            get {
+                return ResourceManager.GetString("Printer_selection", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Printer.
         /// </summary>
@@ -5325,6 +5370,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Show cycle beginning form.
+        /// </summary>
+        internal static string Show_cycle_beginning_form {
+            get {
+                return ResourceManager.GetString("Show_cycle_beginning_form", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Show cycle end form.
         /// </summary>

TBF/Resources/Strings.cs.resx

@@ -1731,4 +1731,7 @@
   <data name="Test_0_config_error_1_is_missing" xml:space="preserve">
     <value>Konfigurace testu {0} : chybí {1}</value>
   </data>
+  <data name="default_printer" xml:space="preserve">
+    <value>předvolená tiskárna</value>
+  </data>
 </root>

TBF/Resources/Strings.resx

@@ -2389,4 +2389,22 @@
   <data name="Wait_until" xml:space="preserve">
     <value>Wait until</value>
   </data>
+  <data name="any_profile" xml:space="preserve">
+    <value>any profile</value>
+  </data>
+  <data name="no_profile" xml:space="preserve">
+    <value>no profile</value>
+  </data>
+  <data name="default_printer" xml:space="preserve">
+    <value>default printer</value>
+  </data>
+  <data name="Print" xml:space="preserve">
+    <value>Print</value>
+  </data>
+  <data name="Printer_selection" xml:space="preserve">
+    <value>Printer selection</value>
+  </data>
+  <data name="Show_cycle_beginning_form" xml:space="preserve">
+    <value>Show cycle beginning form</value>
+  </data>
 </root>

TBF/Rig/Configs/ParamsProvider/ComponentCfgCtrl.cs

@@ -71,8 +71,9 @@ namespace TBF.Rig.Configs.ParamsProvider
                 foreach (var p in parents) parentComboBox.Items.Add(p.Name);
             }
 
-            editors = new Control[paramsProvider.ParamsCount()];
-            for (int i = 0; i < paramsProvider.ParamsCount(); i++)
+            int paramsCount = paramsProvider.ParamsCount();
+            editors = new Control[paramsCount];
+            for (int i = 0; i < paramsCount; i++)
             {
                 ICollection<string> values = paramsProvider.ParamValues(i);
                 if (values == null)
@@ -130,7 +131,8 @@ namespace TBF.Rig.Configs.ParamsProvider
             if (parentComboBox.Visible) parentComboBox.Text = Config.ParentName;
 
             paramsListViewEx.Items.Clear();
-            for (int i = 0; i < paramsProvider.ParamsCount(); i++)
+            int paramsCount = paramsProvider.ParamsCount();
+            for (int i = 0; i < paramsCount; i++)
             {
                 ListViewItem lvi = new ListViewItem(paramsProvider.ParamName(i));
                 lvi.SubItems.Add(paramsProvider.ToString(i));

TBF/Rig/ControlBoard/Uni/Action.cs

@@ -52,6 +52,7 @@ namespace TBF.Rig.ControlBoard.Uni
         public int PID { get; set; }                /// SetFlow
         public int TolerRV { get; set; }            /// SetFlow
         public int StabTime { get; set; }           /// SetFlow
+        public int InitDacVal { get; set; }         /// SetFlow
         public int DivThreshold { get; set; }       /// StartTest argument
 
 
@@ -74,6 +75,7 @@ namespace TBF.Rig.ControlBoard.Uni
             MassPulsesCount = 0;
             RVMovePar1 = 0;
             RVMovePar2 = 0;
+            InitDacVal = 0;
         }
 
 
@@ -173,8 +175,11 @@ namespace TBF.Rig.ControlBoard.Uni
                 RVMovePar1 = rvMovePar1,
                 RVMovePar2 = rvMovePar2,
                 PID = pid,
-                TolerRV = 0,
+                TolerRV = (regValveId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
+                    ? Convert.ToInt32(Math.Round(13.1072 * 0.015 * freqLo)) : 0,
                 StabTime = stabTime,
+                InitDacVal = (regValveId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
+                    ? Convert.ToInt32(Math.Round(13.1072 * freqLo)) : 0,
             };
         }
         void SetSetFlowArgs(Action action)
@@ -186,6 +191,7 @@ namespace TBF.Rig.ControlBoard.Uni
             PID        = action.PID;
             TolerRV    = action.TolerRV;
             StabTime   = action.StabTime;
+            InitDacVal = action.InitDacVal;
         }
         /// Check whether new action arguments are compatible with alredy collected arguments (true = yes)
         bool CheckSharedSetFlowArgs(Action newAction)
@@ -262,7 +268,7 @@ namespace TBF.Rig.ControlBoard.Uni
         ///----------------------------------------------------------------------------------------------
         public static Action RegVlvIncrMove(bool isFromUI, int regValveId, double timeSec)
         {
-            int rvMovePar = Math.Abs(Convert.ToInt32(Math.Round(timeSec / 0.050)));    /// Step is 50 ms
+            int rvMovePar = Math.Abs(Convert.ToInt32(Math.Round(timeSec / 0.050)));     /// Step is 50 ms
 
             return new Action
             {
@@ -290,21 +296,21 @@ namespace TBF.Rig.ControlBoard.Uni
         }
 
         ///----------------------------------------------------------------------------------------------
-        public static Action RegVlvMoveToPos(bool isFromUI, int regValveId, double positionLo, double positionHi = -1)
+        public static Action RegVlvMoveToPos(bool isFromUI, int regValveId, int adcValLo, int adcValHi = -1)
         {
-            int rvMovePar1, rvMovePar2;         /// TODO
-                                                /// 
-            if (positionHi < 0)
+            int rvMovePar1, rvMovePar2;
+
+            if (adcValHi >= 0)
             {
-                /// Center position specified, calculate a range
-                rvMovePar1 = 0; // TODO
-                rvMovePar2 = 0; // TODO
+                /// Lower and upper range of position specified
+                rvMovePar1 = adcValLo;
+                rvMovePar2 = adcValHi;
             }
             else
             {
-                /// Lower and upper range of position specified
-                rvMovePar1 = 0; // TODO
-                rvMovePar2 = 0; // TODO
+                /// Center position specified, calculate a range
+                rvMovePar1 = Math.Max(adcValLo - 5, 0);
+                rvMovePar2 = Math.Min(adcValLo + 5, 1023);
             }
                                         
             return new Action
@@ -570,7 +576,7 @@ namespace TBF.Rig.ControlBoard.Uni
                 }
             }
 
-            log.InfoFormat("Combined action: {0} Rt={1} Et={2} RV={3} Div#={4} Cmd={5} Sync={6} wDiv={7} S/S={8} Prolng={9} ToTank={10} Puls={11} MPls={12} RVMode={13} P1={14} P2={15} pid={16}",
+            log.InfoFormat("Combined action: {0} Rt={1} Et={2} RV={3} Div#={4} Cmd={5} Sync={6} wDiv={7} S/S={8} Prolng={9} ToTank={10} Puls={11} MPls={12} RVMode={13} P1={14} P2={15} Ao1={19}",
                             ((int)combinedAction.ActionId).ToString("X3"),
                             combinedAction.Route.ToString("X32"),
                             combinedAction.FlowMId,
@@ -590,6 +596,7 @@ namespace TBF.Rig.ControlBoard.Uni
                             combinedAction.PID,
                             combinedAction.TolerRV,
                             combinedAction.StabTime,
+                            combinedAction.InitDacVal,
                             combinedAction.DivThreshold);
 
             return combinedAction;

TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs

@@ -23,7 +23,7 @@ namespace TBF.Rig.ControlBoard.Uni
         readonly bool readDivTransition;
         readonly Statistics divStartPlotter;
         readonly Statistics divStopPlotter;
-        readonly TBF.Rig.Uni.RegValve.RegValve regV;
+        readonly GenericDevices.IRegValve regV;
         readonly TBF.Rig.GenericDevices.IFlowMeter flowMeter;
         readonly TBF.Rig.Uni.Diverter.Diverter diverter;
 
@@ -66,7 +66,7 @@ namespace TBF.Rig.ControlBoard.Uni
             flowMeter = devices.FlowMeter;
             if (flowMeter == null) throw new ArgumentNullException("Invalid flow meter");
 
-			regV = devices.RegValve as TBF.Rig.Uni.RegValve.RegValve;
+			regV = devices.RegValve as GenericDevices.IRegValve;
             if (regV == null) throw new ArgumentNullException("Invalid regulation valve");
 
             diverter = (withDiverter && devices.Diverter is TBF.Rig.Uni.Diverter.Diverter)

TBF/Rig/ControlBoard/Uni/GeneralData.cs

@@ -19,7 +19,7 @@ namespace TBF.Rig.ControlBoard.Uni
         public ulong State;                                             /// bytes 5,6,7,8,9,80,81 = 7 bytes = 56 bits
         public uint Chyby485;
         public ulong Vystupy;
-        public uint[] StavDA = new uint[2];
+        public int[] StavDA = new int[2];
         public double[] ReferenceFreq = new double[4];
         public int[] EtPulses = new int[Const.WMsCount + 1];            /// EtPulses[0]=total pulses, EtPulses[1..WMsCount] gated et.pulses for respective WM
         public int EtPulsesK;
@@ -93,7 +93,7 @@ namespace TBF.Rig.ControlBoard.Uni
                     ((ulong)data[offs + (int)Poz.Stat6] << 48);
 
             Vystupy = GetUInt64(data, offs + (int)Poz.Vyst);                    /// Byte 10 .. 17
-            StavDA[1] = GetUInt16(data, offs + (int)Poz.SDA2);                  /// Byte 18,19
+            StavDA[1] = Convert.ToInt32(GetUInt16(data, offs + (int)Poz.SDA2)); /// Byte 18,19
             Vstupy = GetUInt40(data, offs + (int)Poz.Vst);                      /// Byte 20,21,22,23,24
             
             /// A/D converters: Feedback from RV-s and diverters
@@ -151,7 +151,7 @@ namespace TBF.Rig.ControlBoard.Uni
             }
             RestartReadingOfWMPulses = false;
 
-            StavDA[0] = GetUInt16(data, offs + (int)Poz.SDA);                   /// Byte 255,256
+            StavDA[0] = Convert.ToInt32(GetUInt16(data, offs + (int)Poz.SDA));  /// Byte 255,256
             byte spare3 = data[offs + (int)Poz.spare3];                         /// Byte 257
 
             /// Impulzy perioda (???)

TBF/Rig/ControlBoard/Uni/OutputMessage.cs

@@ -13,7 +13,6 @@ namespace TBF.Rig.ControlBoard.Uni
         private static readonly ILog log = LogManager.GetLogger(typeof(OutputMessage));
 
         public const int PayloadLen = 38;
-        public const byte MessageCode = (byte)' ';
 
 
         static Action arguments = new Action();
@@ -43,7 +42,7 @@ namespace TBF.Rig.ControlBoard.Uni
             message[0] = Const.STX;
             message[1] = 1;                                 /// Control board addres
             message[2] = (byte)PayloadLen;                  /// Payload length
-            message[3] = MessageCode;
+            message[3] = (byte)' ';                         /// Message code
 
             /// Command
             message[4] = GetCommand(action);
@@ -82,7 +81,8 @@ namespace TBF.Rig.ControlBoard.Uni
             message[26] = 0;
 
             /// Regulation valve
-            message[27] = (action.RegVId < 0) ? (byte)0 : (byte)(action.RegVId | (int)action.RegVMode);
+            message[27] = (action.RegVId < 0 || (action.RegVId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx && action.RegVMode == RegValveMode.TargetFrequency))
+                            ? (byte)0 : (byte)(action.RegVId | (int)action.RegVMode);
             message[28] = (byte)(action.RVMovePar1 & 0xFF);
             message[29] = (byte)((action.RVMovePar1 >> 8) & 0xFF);
             message[30] = (byte)(action.RVMovePar2 & 0xFF);
@@ -90,12 +90,12 @@ namespace TBF.Rig.ControlBoard.Uni
             message[32] = GetRVStopParam(action);
             
             /// DA1
-            message[33] = 0;    /// PrudParL
-            message[34] = 0;    /// PrudParH
+            message[33] = (byte)(arguments.InitDacVal & 0xFF);
+            message[34] = (byte)((arguments.InitDacVal >> 8) & 0xFF);
 
-            message[35] = (byte)Math.Max(1, Math.Min(255, arguments.PID));         /// PIDRV
-            message[36] = 0;    // (byte)Math.Max(4, Math.Min(255, action.TolerRV));     /// TolerRV (4..20 mA reg.valve only)
-            message[37] = (byte)Math.Max(0, Math.Min(255, arguments.StabTime));    /// StabRV
+            message[35] = (byte)Math.Max(1, Math.Min(255, arguments.PID));          /// PIDRV
+            message[36] = (byte)Math.Max(4, Math.Min(255, action.TolerRV));         /// TolerRV (4..20 mA reg.valve only)
+            message[37] = (byte)Math.Max(0, Math.Min(255, arguments.StabTime));     /// StabRV
             message[38] = (byte)((arguments.DivThreshold >> 2) & 0xFF);
 
             message[39] = 0;
@@ -144,11 +144,19 @@ namespace TBF.Rig.ControlBoard.Uni
             return (byte)StopDevs.All;
         }
 
-        static byte GetRVStopParam(Action action)
+        static byte GetRVStopParam(Action a)
         {
-            if (action.IsStop())                              return (byte)0x20;
-            if ((action.ActionId & ActionID.RegVlvStop) != 0) return (byte)0x20;
-            return (byte)0;
+            if (a.IsStop() || (a.ActionId & ActionID.RegVlvStop) != 0)
+            {
+                return (byte)0x20;
+            }
+
+            if ((a.ActionId & ActionID.SetFlow) != 0 && a.RegVId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
+            {
+                return (byte)0x42;
+            }
+
+            return 0;
         }
     }
 

TBF/Rig/ControlBoard/Uni/UniCB.cs

@@ -804,8 +804,17 @@ namespace TBF.Rig.ControlBoard.Uni
         {
             if (IsUIBlocked && isFromUI) return;
 
-            actionQueue.Enqueue(Action.RegVlvStop(isFromUI, regVId));
-            log.InfoFormat("Enqueue( RegVlvStop(rv={0}) )", regVId);
+            if (regVId < TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
+            {
+                actionQueue.Enqueue(Action.RegVlvStop(isFromUI, regVId));
+                log.InfoFormat("Enqueue( RegVlvStop(rv={0}) )", regVId);
+            }
+            else if (regVId == TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx)
+            {
+                int dacVal = Data.StavDA[0];
+                actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, dacVal));
+                log.InfoFormat("Enqueue( RegVlvMoveToPos(rv={0}, positionLo={1}) )", regVId, dacVal);
+            }
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 
@@ -825,7 +834,7 @@ namespace TBF.Rig.ControlBoard.Uni
         /// <param name="time">Time in seconds, positive value opens the reg. valve</param>
         public void RegVlvIncrMove(bool isFromUI, int regVId, double time)
         {
-            if (IsUIBlocked && isFromUI) return;
+            if (IsUIBlocked && isFromUI || regVId >= TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx) return;
             
             var newAction = Action.RegVlvIncrMove(isFromUI, regVId, time);
             
@@ -859,12 +868,12 @@ namespace TBF.Rig.ControlBoard.Uni
         /// </summary>
         /// <param name="rvId">Reg. valve ID</param>
         /// <param name="position">Reg. valve position (0 .. 1.0)</param>
-        public void RegVlvMoveToPos(bool isFromUI, int regVId, double positionLo, double positionHi = -1)
+        public void RegVlvMoveToPos(bool isFromUI, int regVId, int adcValLo, int adcValHi = -1)
         {
-            if (IsUIBlocked && isFromUI) return;
+            if (IsUIBlocked && isFromUI || regVId > TBF.Rig.Uni.RegValveAnalog.RegValve.RVAnalogIdx) return;
 
-            actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, positionLo, positionHi));
-            log.InfoFormat("Enqueue( RegVlvMoveToPos(rv={0}, positionLo={1}, positionHi={2}) )", regVId, positionLo, positionHi);
+            actionQueue.Enqueue(Action.RegVlvMoveToPos(isFromUI, regVId, adcValLo, adcValHi));
+            log.InfoFormat("Enqueue( RegVlvMoveToPos(rv={0}, positionLo={1}, positionHi={2}) )", regVId, adcValLo, adcValHi);
             foreach (var a in actionQueue) log.DebugFormat("   {0}", a);
         }
 

TBF/Rig/Danfoss/VLT2800/Pump.cs

@@ -102,14 +102,14 @@ namespace TBF.Rig.Danfoss.VLT2800
         /// 
         public void IncreaseSetpoint()
         {
-            power += 0.05;
+            power += 2.0;
             if (power > 100.0) power = 100.0;
             TurnOn(power);
         }
         /// 
         public void DecreaseSetpoint()
         {
-            power -= 0.05;
+            power -= 2.0;
             if (power <= 0)
             {
                 power = 0;
@@ -122,12 +122,10 @@ namespace TBF.Rig.Danfoss.VLT2800
         }
 
 
-		readonly IControlBoard controlBoard;
-
 		int bitNr;					/// 0 .. 127
         public UInt128 Mask;		/// derived from bitPosition in the constructor
 
-		public bool State { get { return (controlBoard.Route & Mask) != 0; } }
+		public bool State { get { return (TBF.Rig.StateMachine.ControlBoard.Route & Mask) != 0; } }
 
 		/// Private fields
 		SerialPort serialPort;
@@ -146,15 +144,12 @@ namespace TBF.Rig.Danfoss.VLT2800
 			: base(cfg)
 		{
 			pumpCfg = cfg as PumpCfg;
-
-            controlBoard = TbfComponents.FindComponent("CB", components) as IControlBoard;	    /// TODO: replace "CB"
-			if (controlBoard == null) throw new Exception("Cannot find " + Name + " parent");
-
-            log.Warn(this.ToString());
 		}
 
         public override void Initialize()
 		{
+            if (TBF.Rig.StateMachine.ControlBoard == null) throw new Exception("Control board is missing");
+
             bitNr = pumpCfg.BitNr;
             Mask = (((UInt128)1) << bitNr);
 
@@ -174,7 +169,7 @@ namespace TBF.Rig.Danfoss.VLT2800
                 serialPort.Handshake = Handshake.None;
                 serialPort.Open();
                 responseBuilder = new StringBuilder(40);
-                log.FatalFormat("{0} - Device successfully initialized", Name);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
             }
             else
             {

TBF/Rig/DataEntry/DEItem.cs

@@ -0,0 +1,117 @@
+///
+/// Copyright (c) 2023 Sensus Slovensko a.s.
+///
+using System.Collections.Generic;
+using Common;
+
+namespace TBF.Rig.DataEntry
+{
+    ///
+    /// Ac = Action
+    ///
+    public enum Ac
+    {
+        [Description("Clear")]              Clear,          /// Clear when the form is open, save on OK
+        [Description("Last from history")]  HistoryLast,
+        [Description("Load")]               Load,           /// Load from water meters when the form is open, save on OK
+        [Description("Load (readonly)")]    LoadReadOnly,   /// Load from water meters when the form is open, prevent changes, do not save
+        Count,
+    }
+
+    ///
+    /// Ct = Content
+    ///
+    public enum Ct
+    {
+        [Description("None")]                None,
+        [Description("Serial nr.")]          SerialNr,
+        [Description("Serial nr. aux")]      SerialNrAux,
+        [Description("Radio address")]       RadioAddress,
+        [Description("Year of calibration")] YearOfCalibration,
+        [Description("Start state")]         StartState,
+        [Description("End state")]           EndState,
+        [Description("Archive path")]        ArchivePath,
+        [Description("WM Order")]            WmOrder,
+        [Description("Batch order")]         BatchOrder,
+        [Description("Batch and WM order")]  BatchAndWmOrder,
+        [Description("WM Remark")]           WmRemark,
+        [Description("Batch remark")]        BatchRemark,
+        [Description("Batch and WM remark")] BatchAndWmRemark,
+#if ORACLE_DB
+        [Description("Prefix")]              Prefix,
+        [Description("Suffix")]              Suffix,
+#endif
+        Count
+    }
+
+    ///
+    /// Identifies image instance
+    ///
+    public enum Tst
+    {
+        Start,
+        End,
+        Both,
+    }
+
+    ///
+    /// Image rotation
+    ///
+    public enum Rotation
+    {
+        R0,
+        R90,
+        R180,
+        R270,
+        Count
+    }
+
+    public class DEItem
+    {
+        public readonly Ct Content;
+        public readonly string Caption;
+        public readonly Ac Action;
+        public readonly int Width;
+
+        public DEItem(Ct content, string caption, Ac action, int width)
+        {
+            Content = content;
+            Caption = caption;
+            Action = action;
+            Width = width;
+        }
+
+
+        static IList<DEItem> items = new List<DEItem>();
+        /// 
+        public static void ClearItems() { items.Clear(); }
+        public static void AddItem(DEItem item) { items.Add(item); }
+        public static void AddItem(Ct content, string caption, Ac action, int width)
+        {
+            items.Add(new DEItem(content, caption, action, width));
+        }
+        public static IList<DEItem> GetItems() { return items; }
+
+
+        static IList<DEItem> columns = new List<DEItem>();
+        /// 
+        public static void ClearColumns() { columns.Clear(); }
+        public static void AddColumn(DEItem column) { columns.Add(column); }
+        public static void AddColumn(Ct content, string caption, Ac action, int width)
+        {
+            columns.Add(new DEItem(content, caption, action, width));
+        }
+        public static IList<DEItem> GetColumns() { return columns; }
+
+
+        static IList<DEItem> summaryColumns = new List<DEItem>();
+        /// 
+        public static void ClearSummaryColumns() { summaryColumns.Clear(); }
+        public static void AddSummaryColumn(DEItem column) { summaryColumns.Add(column); }
+        public static void AddSummaryColumn(Ct content, string caption, Ac action, int width)
+        {
+            summaryColumns.Add(new DEItem(content, caption, action, width));
+        }
+        public static IList<DEItem> GetSummaryColumns() { return summaryColumns; }
+    }
+}

TBF/Rig/DataEntry/DEUtils.cs

@@ -1,13 +1,85 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2023 Sensus Slovensko a.s.
 ///
-using System;
 using System.Windows.Forms;
+using Results.Entities;
 
 namespace TBF.Rig.DataEntry
 {
     public class DEUtils
     {
+        public static string GetContent(Ct content, WaterMeter wm)
+        {
+            if (wm == null) return string.Empty;
+
+            switch (content)
+            {
+                default:
+                case Ct.None: return string.Empty;
+                case Ct.SerialNr: return (!wm.Disabled && wm.SerialNr != null) ? wm.SerialNr : string.Empty;
+                case Ct.SerialNrAux: return (!wm.Disabled && wm.SerialNrAux != null) ? wm.SerialNrAux : string.Empty;
+                case Ct.RadioAddress: return (!wm.Disabled && wm.RadioAddress != null) ? wm.RadioAddress : string.Empty;
+                case Ct.YearOfCalibration: return (!wm.Disabled) ? wm.YearOfProduction.ToString() : string.Empty;
+                case Ct.StartState: return (!wm.Disabled && wm.GetStartState() != null) ? wm.GetStartState() : string.Empty;
+                case Ct.EndState: return (!wm.Disabled && wm.EndState != null) ? wm.EndState : string.Empty;
+                case Ct.ArchivePath: return (!wm.Disabled && wm.ArchivePath != null) ? wm.ArchivePath : string.Empty;
+
+                case Ct.WmOrder: return (!wm.Disabled && wm.PurchaseOrder != null) ? wm.PurchaseOrder : string.Empty;
+                case Ct.BatchOrder: return (wm.Batch != null && wm.Batch.PurchaseOrder != null) ? wm.Batch.PurchaseOrder : string.Empty;
+                case Ct.BatchAndWmOrder: return (wm.Batch != null && wm.Batch.PurchaseOrder != null) ? wm.Batch.PurchaseOrder : string.Empty;
+
+                case Ct.WmRemark: return (!wm.Disabled && wm.Remark != null) ? wm.Remark : string.Empty;
+                case Ct.BatchRemark: return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
+                case Ct.BatchAndWmRemark: return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
+#if ORACLE_DB
+                case Ct.Prefix: return (!wm.Disabled && wm.Prefix != null) ? wm.Prefix : string.Empty;
+                case Ct.Suffix: return (!wm.Disabled && wm.Suffix != null) ? wm.Suffix : string.Empty;
+#endif
+            }
+        }
+
+        public static void PutContent(Ct content, WaterMeter wm, string value)
+        {
+            if (wm == null || wm.Disabled) return;
+
+            int year;
+
+            switch (content)
+            {
+                default:
+                case Ct.None: return;
+                case Ct.SerialNr: wm.SerialNr = value; return;
+                case Ct.SerialNrAux: wm.SerialNrAux = value; return;
+                case Ct.RadioAddress: wm.RadioAddress = value; return;
+                case Ct.YearOfCalibration: if (int.TryParse(value, out year)) wm.YearOfProduction = year; return;
+                case Ct.StartState: wm.SetStartState(value); return;
+                case Ct.EndState: wm.EndState = value; return;
+                case Ct.ArchivePath: wm.ArchivePath = value; return;
+
+                case Ct.WmOrder:
+                    wm.PurchaseOrder = value;
+                    return;
+
+                case Ct.BatchOrder:
+                case Ct.BatchAndWmOrder:
+                    if (wm.Batch != null) wm.Batch.PurchaseOrder = value;
+                    return;
+
+                case Ct.WmRemark:
+                    wm.Remark = value;
+                    return;
+
+                case Ct.BatchRemark:
+                case Ct.BatchAndWmRemark:
+                    if (wm.Batch != null) wm.Batch.Remark = value;
+                    return;
+#if ORACLE_DB
+                case Ct.Prefix: wm.Prefix = value; return;
+                case Ct.Suffix: wm.Suffix = value; return;
+#endif
+            }
+        }
+
         /// <summary>
         /// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array
         /// </summary>

TBF/Rig/DataEntry/Double24/CycleBeginningForm.cs

@@ -1,445 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.Rig.DataEntry.Double24
-{
-	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 WMsCount;
-        readonly EntryFormCfg entryFormCfg;
-
-		/// To be retrieved after the form is closed
-		public string PurchaseOrder;
-        public string Prefix;
-		public string[] SNText;
-        public string[] Column2Text;
-        public string[] suffixText;
-        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;
-        ComboBox[] column2ComboBoxes;
-        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,
-				};
-            column2ComboBoxes = new ComboBox[]
-				{
-					suffixComboBox1,  suffixComboBox2,  suffixComboBox3,  suffixComboBox4,  suffixComboBox5,  suffixComboBox6,
-					suffixComboBox7,  suffixComboBox8,  suffixComboBox9,  suffixComboBox10, suffixComboBox11, suffixComboBox12,
-					suffixComboBox13, suffixComboBox14, suffixComboBox15, suffixComboBox16, suffixComboBox17, suffixComboBox18,
-					suffixComboBox19, suffixComboBox20, suffixComboBox21, suffixComboBox22, suffixComboBox23, suffixComboBox24,
-				};
-            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, EntryFormCfg entryFormCfg)
-			: this()
-        {
-            this.WMsCount = waterMetersCount;
-            this.entryFormCfg = entryFormCfg;
-
-            SNText = new string[WMsCount];
-            Column2Text = new string[WMsCount];
-            suffixText = new string[WMsCount];
-			Disabled = new bool[WMsCount];
-
-            if (entryFormCfg.HideOrderSelection)
-                orderGroupBox.Visible = false;
-            else
-                PrepareOrderCombo(orderComboBox);
-
-            if (entryFormCfg.HidePrefix)
-                prefixGroupBox.Visible = false;
-            else
-                PreparePrefixCombo(prefixComboBox);
-
-			ShuffleTextBoxes(TBF.Data.WMsCount, TBF.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];
-                        column2ComboBoxes[dest] = column2ComboBoxes[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();
-			
-			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]);
-                }
-                if (Program.LocalSettings.LastAuxSNTextsCount == textBoxesCount)
-                {
-                    column2ComboBoxes[i].Items.Add((Program.LocalSettings.LastAuxSNTexts[i] == null) ? string.Empty : Program.LocalSettings.LastAuxSNTexts[i]);
-                }
-
-                labels[i].Visible = comboBoxes[i].Visible = column2ComboBoxes[i].Visible = checkBoxes[i].Visible = true;
-
-				enabledComboBoxes.Add(comboBoxes[i]);
-                enabledComboBoxes.Add(column2ComboBoxes[i]);
-            }
-		}
-
-		void Localize()
-		{
-			Text = Strings.Data;
-			orderGroupBox.Text = Strings.Purchase_order;
-			for (int i = 0; i < textBoxesCount; i++) labels[i].Text = (i + 1).ToString();
-			okButton.Text = Strings.OkBtnText;
-			clearButton.Text = Strings.ClearBtnText;
-
-            column2Label.Text = columnm2Label2.Text = entryFormCfg.Column2Caption;
-		}
-
-		/// <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();
-        }
-
-        /// <summary>
-        /// Load Prefix combo box items from the LocalSettings PrefixHistory array
-        /// </summary>
-        /// <param name="orderComboBox">Prefix ComboBox</param>
-        void PreparePrefixCombo(ComboBox prefixComboBox)
-		{
-            for (int i = 0; i < Program.LocalSettings.PrefixHistoryCount; i++)
-            {
-                prefixComboBox.Items.Add(Program.LocalSettings.PrefixHistory[i]);
-            }
-
-            if (prefixComboBox.Items.Count > 0) prefixComboBox.Text = prefixComboBox.Items[0].ToString();
-        }
-
-		private void okButton_Click(object sender, EventArgs e)
-        {
-			for (int i = 0; i < Math.Min(WMsCount, textBoxesCount); i++)
-			{
-				SNText[i] = comboBoxes[i].Text;
-                suffixText[i] = column2ComboBoxes[i].Text;
-                Column2Text[i] = string.Format("{0}{1}", prefixComboBox.Text, column2ComboBoxes[i].Text);
-                Disabled[i] = !checkBoxes[i].Checked;
-			}
-
-            PurchaseOrder = entryFormCfg.HideOrderSelection ? string.Empty : orderComboBox.Text;
-            Prefix = entryFormCfg.HidePrefix ? string.Empty : prefixComboBox.Text;
-            Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
-            Program.LocalSettings.UpdateHistory(prefixComboBox.Text, ref Program.LocalSettings.PrefixHistory);
-            Program.LocalSettings.LastSNTexts = SNText;
-            Program.LocalSettings.LastAuxSNTexts = suffixText;
-
-            completed = true;
-            Close();
-        }
-
-		private void clearButton_Click(object sender, EventArgs e)
-		{
-			for (int i = 0; i < Math.Min(WMsCount, textBoxesCount); i++)
-			{			
-				comboBoxes[i].Text = string.Empty;
-				checkBoxes[i].Checked = false;
-			}
-		}
-
-
-		private void comboBox1_SelectedIndexChanged(object s, EventArgs e) { if (comboBox1.Text.Equals(comboBox1.Items[0])) UpdateAllCombos(); }
-		private void comboBox2_SelectedIndexChanged(object s, EventArgs e) { if (comboBox2.Text.Equals(comboBox2.Items[0])) UpdateAllCombos(); }
-		private void comboBox3_SelectedIndexChanged(object s, EventArgs e) { if (comboBox3.Text.Equals(comboBox3.Items[0])) UpdateAllCombos(); }
-		private void comboBox4_SelectedIndexChanged(object s, EventArgs e) { if (comboBox4.Text.Equals(comboBox4.Items[0])) UpdateAllCombos(); }
-		private void comboBox5_SelectedIndexChanged(object s, EventArgs e) { if (comboBox5.Text.Equals(comboBox5.Items[0])) UpdateAllCombos(); }
-		private void comboBox6_SelectedIndexChanged(object s, EventArgs e) { if (comboBox6.Text.Equals(comboBox6.Items[0])) UpdateAllCombos(); }
-		private void comboBox7_SelectedIndexChanged(object s, EventArgs e) { if (comboBox7.Text.Equals(comboBox7.Items[0])) UpdateAllCombos(); }
-		private void comboBox8_SelectedIndexChanged(object s, EventArgs e) { if (comboBox8.Text.Equals(comboBox8.Items[0])) UpdateAllCombos(); }
-		private void comboBox9_SelectedIndexChanged(object s, EventArgs e) { if (comboBox9.Text.Equals(comboBox9.Items[0])) UpdateAllCombos(); }
-		private void comboBox10_SelectedIndexChanged(object s, EventArgs e) { if (comboBox10.Text.Equals(comboBox10.Items[0])) UpdateAllCombos(); }
-		private void comboBox11_SelectedIndexChanged(object s, EventArgs e) { if (comboBox11.Text.Equals(comboBox11.Items[0])) UpdateAllCombos(); }
-		private void comboBox12_SelectedIndexChanged(object s, EventArgs e) { if (comboBox12.Text.Equals(comboBox12.Items[0])) UpdateAllCombos(); }
-		private void comboBox13_SelectedIndexChanged(object s, EventArgs e) { if (comboBox13.Text.Equals(comboBox13.Items[0])) UpdateAllCombos(); }
-		private void comboBox14_SelectedIndexChanged(object s, EventArgs e) { if (comboBox14.Text.Equals(comboBox14.Items[0])) UpdateAllCombos(); }
-		private void comboBox15_SelectedIndexChanged(object s, EventArgs e) { if (comboBox15.Text.Equals(comboBox15.Items[0])) UpdateAllCombos(); }
-		private void comboBox16_SelectedIndexChanged(object s, EventArgs e) { if (comboBox16.Text.Equals(comboBox16.Items[0])) UpdateAllCombos(); }
-		private void comboBox17_SelectedIndexChanged(object s, EventArgs e) { if (comboBox17.Text.Equals(comboBox17.Items[0])) UpdateAllCombos(); }
-		private void comboBox18_SelectedIndexChanged(object s, EventArgs e) { if (comboBox18.Text.Equals(comboBox18.Items[0])) UpdateAllCombos(); }
-		private void comboBox19_SelectedIndexChanged(object s, EventArgs e) { if (comboBox19.Text.Equals(comboBox19.Items[0])) UpdateAllCombos(); }
-		private void comboBox20_SelectedIndexChanged(object s, EventArgs e) { if (comboBox20.Text.Equals(comboBox20.Items[0])) UpdateAllCombos(); }
-		private void comboBox21_SelectedIndexChanged(object s, EventArgs e) { if (comboBox21.Text.Equals(comboBox21.Items[0])) UpdateAllCombos(); }
-		private void comboBox22_SelectedIndexChanged(object s, EventArgs e) { if (comboBox22.Text.Equals(comboBox22.Items[0])) UpdateAllCombos(); }
-		private void comboBox23_SelectedIndexChanged(object s, EventArgs e) { if (comboBox23.Text.Equals(comboBox23.Items[0])) UpdateAllCombos(); }
-		private void comboBox24_SelectedIndexChanged(object s, EventArgs e) { if (comboBox24.Text.Equals(comboBox24.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox1_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox1.Text.Equals(suffixComboBox1.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox2_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox2.Text.Equals(suffixComboBox2.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox3_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox3.Text.Equals(suffixComboBox3.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox4_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox4.Text.Equals(suffixComboBox4.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox5_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox5.Text.Equals(suffixComboBox5.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox6_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox6.Text.Equals(suffixComboBox6.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox7_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox7.Text.Equals(suffixComboBox7.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox8_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox8.Text.Equals(suffixComboBox8.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox9_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox9.Text.Equals(suffixComboBox9.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox10_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox10.Text.Equals(suffixComboBox10.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox11_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox11.Text.Equals(suffixComboBox11.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox12_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox12.Text.Equals(suffixComboBox12.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox13_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox13.Text.Equals(suffixComboBox13.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox14_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox14.Text.Equals(suffixComboBox14.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox15_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox15.Text.Equals(suffixComboBox15.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox16_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox16.Text.Equals(suffixComboBox16.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox17_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox17.Text.Equals(suffixComboBox17.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox18_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox18.Text.Equals(suffixComboBox18.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox19_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox19.Text.Equals(suffixComboBox19.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox20_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox20.Text.Equals(suffixComboBox20.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox21_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox21.Text.Equals(suffixComboBox21.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox22_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox22.Text.Equals(suffixComboBox22.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox23_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox23.Text.Equals(suffixComboBox23.Items[0])) UpdateAllCombos(); }
-        private void suffixComboBox24_SelectedIndexChanged(object s, EventArgs e) { if (suffixComboBox24.Text.Equals(suffixComboBox24.Items[0])) UpdateAllCombos(); }
-
-        /// <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(WMsCount, textBoxesCount); i++)
-            {
-                if (Program.LocalSettings.LastSNTextsCount > i) comboBoxes[i].Text = Program.LocalSettings.LastSNTexts[i];
-                if (Program.LocalSettings.LastAuxSNTextsCount > i) column2ComboBoxes[i].Text = Program.LocalSettings.LastAuxSNTexts[i];
-                checkBoxes[i].Checked = !string.IsNullOrEmpty(comboBoxes[i].Text) || !string.IsNullOrEmpty(column2ComboBoxes[i].Text);
-            }
-        }
-
-
-		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); }
-        private void suffixComboBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox1); }
-        private void suffixComboBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox2); }
-        private void suffixComboBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox3); }
-        private void suffixComboBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox4); }
-        private void suffixComboBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox5); }
-        private void suffixComboBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox6); }
-        private void suffixComboBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox7); }
-        private void suffixComboBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox8); }
-        private void suffixComboBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox9); }
-        private void suffixComboBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox10); }
-        private void suffixComboBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox11); }
-        private void suffixComboBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox12); }
-        private void suffixComboBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox13); }
-        private void suffixComboBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox14); }
-        private void suffixComboBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox15); }
-        private void suffixComboBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox16); }
-        private void suffixComboBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox17); }
-        private void suffixComboBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox18); }
-        private void suffixComboBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox19); }
-        private void suffixComboBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox20); }
-        private void suffixComboBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox21); }
-        private void suffixComboBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox22); }
-        private void suffixComboBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox23); }
-        private void suffixComboBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, suffixComboBox24); }
-
-        /// <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_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; }
-        private void comboBox2_TextChanged(object sender, EventArgs e) { checkBox2.Checked = true; }
-        private void comboBox3_TextChanged(object sender, EventArgs e) { checkBox3.Checked = true; }
-        private void comboBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; }
-        private void comboBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; }
-        private void comboBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; }
-        private void comboBox7_TextChanged(object sender, EventArgs e) { checkBox7.Checked = true; }
-        private void comboBox8_TextChanged(object sender, EventArgs e) { checkBox8.Checked = true; }
-        private void comboBox9_TextChanged(object sender, EventArgs e) { checkBox9.Checked = true; }
-        private void comboBox10_TextChanged(object sender, EventArgs e) { checkBox10.Checked = true; }
-        private void comboBox11_TextChanged(object sender, EventArgs e) { checkBox11.Checked = true; }
-        private void comboBox12_TextChanged(object sender, EventArgs e) { checkBox12.Checked = true; }
-        private void comboBox13_TextChanged(object sender, EventArgs e) { checkBox13.Checked = true; }
-        private void comboBox14_TextChanged(object sender, EventArgs e) { checkBox14.Checked = true; }
-        private void comboBox15_TextChanged(object sender, EventArgs e) { checkBox15.Checked = true; }
-        private void comboBox16_TextChanged(object sender, EventArgs e) { checkBox16.Checked = true; }
-        private void comboBox17_TextChanged(object sender, EventArgs e) { checkBox17.Checked = true; }
-        private void comboBox18_TextChanged(object sender, EventArgs e) { checkBox18.Checked = true; }
-        private void comboBox19_TextChanged(object sender, EventArgs e) { checkBox19.Checked = true; }
-        private void comboBox20_TextChanged(object sender, EventArgs e) { checkBox20.Checked = true; }
-        private void comboBox21_TextChanged(object sender, EventArgs e) { checkBox21.Checked = true; }
-        private void comboBox22_TextChanged(object sender, EventArgs e) { checkBox22.Checked = true; }
-        private void comboBox23_TextChanged(object sender, EventArgs e) { checkBox23.Checked = true; }
-        private void comboBox24_TextChanged(object sender, EventArgs e) { checkBox24.Checked = true; }
-        private void suffixComboBox1_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; }
-        private void suffixComboBox2_TextChanged(object sender, EventArgs e) { checkBox2.Checked = true; }
-        private void suffixComboBox3_TextChanged(object sender, EventArgs e) { checkBox3.Checked = true; }
-        private void suffixComboBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; }
-        private void suffixComboBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; }
-        private void suffixComboBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; }
-        private void suffixComboBox7_TextChanged(object sender, EventArgs e) { checkBox7.Checked = true; }
-        private void suffixComboBox8_TextChanged(object sender, EventArgs e) { checkBox8.Checked = true; }
-        private void suffixComboBox9_TextChanged(object sender, EventArgs e) { checkBox9.Checked = true; }
-        private void suffixComboBox10_TextChanged(object sender, EventArgs e) { checkBox10.Checked = true; }
-        private void suffixComboBox11_TextChanged(object sender, EventArgs e) { checkBox11.Checked = true; }
-        private void suffixComboBox12_TextChanged(object sender, EventArgs e) { checkBox12.Checked = true; }
-        private void suffixComboBox13_TextChanged(object sender, EventArgs e) { checkBox13.Checked = true; }
-        private void suffixComboBox14_TextChanged(object sender, EventArgs e) { checkBox14.Checked = true; }
-        private void suffixComboBox15_TextChanged(object sender, EventArgs e) { checkBox15.Checked = true; }
-        private void suffixComboBox16_TextChanged(object sender, EventArgs e) { checkBox16.Checked = true; }
-        private void suffixComboBox17_TextChanged(object sender, EventArgs e) { checkBox17.Checked = true; }
-        private void suffixComboBox18_TextChanged(object sender, EventArgs e) { checkBox18.Checked = true; }
-        private void suffixComboBox19_TextChanged(object sender, EventArgs e) { checkBox19.Checked = true; }
-        private void suffixComboBox20_TextChanged(object sender, EventArgs e) { checkBox20.Checked = true; }
-        private void suffixComboBox21_TextChanged(object sender, EventArgs e) { checkBox21.Checked = true; }
-        private void suffixComboBox22_TextChanged(object sender, EventArgs e) { checkBox22.Checked = true; }
-        private void suffixComboBox23_TextChanged(object sender, EventArgs e) { checkBox23.Checked = true; }
-        private void suffixComboBox24_TextChanged(object sender, EventArgs e) { checkBox24.Checked = true; }
-
-
-        #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
-    }
-}

TBF/Rig/DataEntry/Double24/CycleEndForm.Designer.cs

@@ -1,652 +0,0 @@
-///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
-///
-namespace TBF.Rig.DataEntry.Double24
-{
-    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.DarkGray;
-            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;
-
-	}
-}

TBF/Rig/DataEntry/Double24/CycleEndForm.cs

@@ -1,155 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.Rig.DataEntry.Double24
-{
-	public partial class CycleEndForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndForm));
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-        public readonly int WMsCount;
-        readonly int lineSize;
-
- 		// To be retrieved after the form closes
-        public string[] EndStateText;
-
-		// Set to 'true' when the form closes
-        public bool Completed { get { return completed; } }
-		bool completed;
-
-        int textBoxesCount;
-        Label[] labels;
-        TextBox[] textBoxes;
-
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-        public CycleEndForm()
-        {
-            InitializeComponent();
-			ControlBox = false;
-
-            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,
-				};
-            textBoxes = new TextBox[]
-				{
-					textBox1,  textBox2,  textBox3,  textBox4,  textBox5,  textBox6,
-					textBox7,  textBox8,  textBox9,  textBox10, textBox11, textBox12,
-					textBox13, textBox14, textBox15, textBox16, textBox17, textBox18,
-					textBox19, textBox20, textBox21, textBox22, textBox23, textBox24,
-				};
-            textBoxesCount = textBoxes.Length;
-            this.WMsCount = textBoxesCount;
-            this.lineSize = textBoxesCount / 2;
-
-            completed = false;
-			StartForceCloseHandler();
-		}
-
-        /// <summary> Parameterless constructor for 3 watermeters </summary>
-        public CycleEndForm(int waterMetersCount, int lineSize)
-            : this()
-        {
-            this.WMsCount = waterMetersCount;
-            this.lineSize = lineSize;
-            ShuffleTextBoxes(waterMetersCount, lineSize);
-            EndStateText = new string[WMsCount];
-        }
-
-        /// <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];
-                        textBoxes[dest] = textBoxes[l * lineSize + l * gap + i];
-                        dest++;
-                    }
-                }
-                textBoxesCount = wmsCount;
-            }
-        }
-
-		private void CycleEndForm_Load(object sender, EventArgs e)
-		{
-			Localize();
-
-            Height = 60 + 36 * lineSize;
-
-            for (int i = 0; i < textBoxesCount; i++)
-            {
-                if (i >= WMsCount)
-                {
-                    labels[i].Visible = false;
-                    textBoxes[i].Visible = false;
-                }
-            }
-		}
-
-		void Localize()
-		{
-			Text = Strings.Data;
-            okButton.Text = Strings.OkBtnText;
-
-            for (int i = 0; i < WMsCount; i++)
-            {
-                labels[i].Text = string.Format("{0} {1}:", Strings.Water_Meter, (i + 1).ToString());
-            }
-		}
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-            for (int i = 0; i < WMsCount; i++)
-            {
-                EndStateText[i] = textBoxes[i].Text;
-            }
-
-			completed = true;
-			Close();
-		}
-
-		#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);
-			};
-		}
-
-		void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-	}
-}

TBF/Rig/DataEntry/Double24/EntryFormCfg.cs

@@ -1,206 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using Common;
-using Config;
-using Config.Entities;
-using TBF.Resources;
-using TBF.Rig.Generic;
-
-namespace TBF.Rig.DataEntry.Double24
-{
-    public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg, IParamsProvider
-	{
-		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
-		public override XmlSerializer GetSerializer() { return Serializer; }
-
-        public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
-        {
-            return new Configs.ParamsProvider.ComponentCfgCtrl(this, null);
-        }
-
-		///
-		/// Serialized parameters
-		///
-		public bool EnterSerialNrsAtTheEnd;
-		public bool ShowCycleEndForm;
-        public bool HideOrderSelection;
-        public bool HidePrefix;
-        public string Column2Caption;
-        public Col2Dest Column2Destination;
-
-		/// Private parameterless constructor invoked by all other (public) constructors
-		EntryFormCfg() { }
-
-        public EntryFormCfg(IComponentFactory factory, string name)
-            : this()
-        {
-            this.Factory = factory;
-            this.Name = name;
-            ParentName = string.Empty;
-            InitializeAll();
-        }
-
-        public string ComponentName { get { return Name; } }
-
-        public void InitializeAll()
-        {
-            EnterSerialNrsAtTheEnd = false;
-            ShowCycleEndForm = false;
-            HideOrderSelection = false;
-            HidePrefix = true;
-            Column2Caption = "Radio address";
-            Column2Destination = Col2Dest.RadioAddress;
-        }
-
-        string[] paramNames = new string[]
-		{
-            Strings.Enter_SNs_at_the_end,
-            Strings.Show_cycle_end_form,
-            "Hide order selection",
-            "Hide prefix selection",
-            "Column 2 caption",
-            "Column 2 destination",
-        };
-        public string ParamName(int i) { return paramNames[i]; }
-        public int ParamsCount() { return paramNames.Length; }
-
-        public ICollection<string> ParamValues(int i)
-        {
-            var list = new List<string>();
-
-            switch (i)
-            {
-                case 0:
-                case 1:
-                case 2:
-                case 3:
-                    return new string[] { Strings.yes, Strings.no };
-                case 4:
-                    return null;
-                case 5:
-                    for (Col2Dest c2d = 0; c2d < Col2Dest.Count; c2d++) list.Add(c2d.ToDescription());
-                    return list;
-                default:
-                    return null;
-            }
-        }
-
-        public string ToString(int i)
-        {
-            switch (i)
-            {
-                case 0:
-                    return EnterSerialNrsAtTheEnd ? Strings.yes : Strings.no;
-                case 1:
-                    return ShowCycleEndForm ? Strings.yes : Strings.no;
-                case 2:
-                    return HideOrderSelection ? Strings.yes : Strings.no;
-                case 3:
-                    return HidePrefix ? Strings.yes : Strings.no;
-                case 4:
-                    return Column2Caption;
-                case 5:
-                    return Column2Destination.ToDescription();
-                default:
-                    return string.Format("Name={0}, Enter SNs at the end={1}, Show cycle end form={2}", Name, EnterSerialNrsAtTheEnd, ShowCycleEndForm);
-            }
-        }
-
-
-        public CfgUpdateFlags UpdateParam(int i, string str)
-        {
-            switch (i)
-            {
-                case 0:
-                    EnterSerialNrsAtTheEnd = (str == Strings.yes);
-                    return CfgUpdateFlags.RestartRqrd;
-                case 1:
-                    ShowCycleEndForm = (str == Strings.yes);
-                    return CfgUpdateFlags.RestartRqrd;
-                case 2:
-                    HideOrderSelection = (str == Strings.yes);
-                    return CfgUpdateFlags.RestartRqrd;
-                case 3:
-                    HidePrefix = (str == Strings.yes);
-                    return CfgUpdateFlags.RestartRqrd;
-                case 4:
-                    Column2Caption = str;
-                    return CfgUpdateFlags.RestartRqrd;
-                case 5:
-                    for (Col2Dest c2d = 0; c2d < Col2Dest.Count; c2d++)
-                    {
-                        if (str == c2d.ToDescription())
-                        {
-                            Column2Destination = c2d;
-                            return CfgUpdateFlags.RestartRqrd;
-                        }
-                    }
-                    return CfgUpdateFlags.None;
-                default:
-                    return CfgUpdateFlags.None;
-            }
-        }
-
-        public bool ValidateParam(int i, string str, out string message)
-        {
-            switch (i)
-            {
-                case 0:
-                case 1:
-                case 2:
-                case 3:
-                case 5:
-                    message = string.Empty;
-                    if (ParamValues(i).Contains(str)) return true;
-                    break;
-                case 4:
-                    message = string.Empty;
-                    return true;
-                default:
-                    message = "Invalid index";
-                    return false;
-            }
-
-            message = string.Format(Strings.Invalid_0, ParamName(i)) ;
-            return false;
-        }
-
-        void CopyContentTo(EntryFormCfg prms)
-        {
-            prms.EnterSerialNrsAtTheEnd = EnterSerialNrsAtTheEnd;
-            prms.ShowCycleEndForm = ShowCycleEndForm;
-            prms.HideOrderSelection = HideOrderSelection;
-            prms.HidePrefix = HidePrefix;
-            prms.Column2Caption = Column2Caption;
-            prms.Column2Destination = Column2Destination;
-        }
-
-        public IParamsProvider Clone()
-        {
-            EntryFormCfg pars = new EntryFormCfg();
-            CopyContentTo(pars);
-            return pars;
-        }
-
-        public bool UpdateEmbeddedDbEntity()
-        {
-            return true;    /// =OK, do nothing
-        }
-    }
-
-    public enum Col2Dest
-    {
-        [Description("Radio address")]  RadioAddress,
-        [Description("Serial nr. Aux")] SerialNrAux,
-        [Description("Purchase order")] OrderNr,
-        [Description("Remark")]         Remark,
-#if ORACLE_DB
-        [Description("Suffix")]         Suffix,
-#endif
-        Count
-    }
-}

TBF/Rig/DataEntry/Double24/EntryFormNoStartEnd.cs

@@ -1,308 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using log4net;
-using Config.Entities;
-using TBF.Rig;
-using TBF.Rig.GenericDevices;
-
-namespace TBF.Rig.DataEntry.Double24
-{
-	public class EntryFormNoStartEnd : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
-	{
-        private static readonly ILog log = LogManager.GetLogger(typeof(EntryFormNoStartEnd));
-        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
-
-		public bool UsesCameras() { return false; }
-
-        readonly EntryFormCfg entryFormCfg;
-		IRegReader[] regReaders;
-
-		/// <summary>
-		/// Properties set by the Begin, End and WMStates form
-		/// </summary>
-		bool[] disabled;				/// This array is shared between forms
-
-		string[] wmCycleEndState;
-		public string WMCycleEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmCycleEndState.Length) ? wmCycleEndState[wmNr] : string.Empty; }
-
-		double[] wmStartState;
-		public double WMStartState(int wmNr) { return (wmNr >= 0 && wmNr < wmStartState.Length) ? wmStartState[wmNr] : 0; }
-
-		double[] wmEndState;
-		public double WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : 0; }
-
-		string[] wmStartStateStr;
-		
-
-        System.Windows.Forms.Form modelessDlg;
-        public bool Completed { get { return (modelessDlg is IHasCompleted) ? (modelessDlg as IHasCompleted).Completed : true; } }
-
-		double refVolume;
-		double errLimLo;
-		double errLimHi;
-
-		bool resultSaved;								/// Set in Run() when results are saved
-
-		IList<Results.Entities.WaterMeter> waterMeters;		/// Reference to ...ProcessData.BatchRslts.WaterMeters[]
-
-		public enum CurrentOp
-		{
-			None,
-			ShowFormAtCycleBeginning,
-			ShowFormAtCycleEnd,
-			EnterTestStartStates,
-			EnterTestEndStates,
-		}
-
-		CurrentOp currentOp;
-
-
-		public EntryFormNoStartEnd() { }
-
-		public EntryFormNoStartEnd(Generic.IComponentCfg cfg)
-			: base(cfg)
-		{
-			entryFormCfg = cfg as EntryFormCfg;
-        }
-
-        public override void Initialize()
-        {
-            disabled = new bool[TBF.Data.WMsCount];
-            wmStartState = new double[TBF.Data.WMsCount];
-            wmStartStateStr = new string[TBF.Data.WMsCount];
-            wmEndState = new double[TBF.Data.WMsCount];
-            wmCycleEndState = new string[TBF.Data.WMsCount];
-            currentOp = CurrentOp.None;
-            log.FatalFormat("{0} initialized: {1}", Name, this);
-        }
-
-
-		/// <returns>Reference to the operation</returns>
-		public IOperation ShowCycleBeginFormOp()
-		{
-			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
-			currentOp = CurrentOp.ShowFormAtCycleBeginning;
-			this.waterMeters = TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters;
-			return this;
-		}
-
-		/// <returns>Reference to the operation</returns>
-        public IOperation ShowCycleEndFormOp(IList<Results.Entities.WaterMeter> waterMeters)
-		{
-			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
-			currentOp = CurrentOp.ShowFormAtCycleEnd;
-            this.waterMeters = waterMeters;
-			return this;
-		}
-
-        /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
-        {
-			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
-			currentOp = CurrentOp.EnterTestStartStates;
-			this.regReaders = regReaders;
-			return this;
-		}
-
-		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
-		{
-			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
-			currentOp = CurrentOp.EnterTestEndStates;
-			this.regReaders = regReaders;
-			this.refVolume = refVolume;
-			this.errLimLo = errLimLo;
-			this.errLimHi = errLimHi;
-			return this;
-		}
-
-        public IOperation ShowAdvancedTestStartFormOp(IRegReader[] regReaders, IList<Results.Entities.WaterMeter> waterMeters, bool isCondOp = false)
-        {
-            return null;
-        }
-
-        delegate void EntryFormDlgt(EntryFormNoStartEnd myRef);
-        /// 
-        void OpenBeginningDlg(EntryFormNoStartEnd myRef)
-        {
-            myRef.modelessDlg = new CycleBeginningForm(TBF.Data.WMsCount, entryFormCfg);
-            modelessDlg.Show();
-        }
-        /// 
-        void OpenEndDlg(EntryFormNoStartEnd myRef)
-        {
-			myRef.modelessDlg = new CycleEndForm(TBF.Data.WMsCount, TBF.Data.LineSize);
-            modelessDlg.Show();
-        }
-		///
-		void OpenTestStartStatesDlg(EntryFormNoStartEnd myRef)
-		{
-			myRef.modelessDlg = new TestStartEndForm(TBF.Data.WMsCount, myRef.regReaders, myRef.disabled);
-			modelessDlg.Show();
-		}
-		///
-		void OpenTestEndStatesDlg(EntryFormNoStartEnd myRef)
-		{
-			myRef.modelessDlg = new TestStartEndForm(TBF.Data.WMsCount, myRef.regReaders, wmStartStateStr, disabled, refVolume, errLimLo, errLimHi);
-			modelessDlg.Show();
-		}
-
-		/// <summary>Start this operation</summary>
-		public void Start()
-		{
-			resultSaved = false;
-			switch (currentOp)
-            {
-                case CurrentOp.ShowFormAtCycleBeginning:
-					if (!entryFormCfg.EnterSerialNrsAtTheEnd)
-					{
-						Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
-					}
-                    break;
-                case CurrentOp.ShowFormAtCycleEnd:
-					if (entryFormCfg.EnterSerialNrsAtTheEnd)
-					{
-						Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this);
-					}
-					else if (entryFormCfg.ShowCycleEndForm)
-					{
-						Program.MainWnd.Invoke(new EntryFormDlgt(OpenEndDlg), this);
-					}
-                    break;
-				case CurrentOp.EnterTestStartStates:
-					Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestStartStatesDlg), this);
-					break;
-				case CurrentOp.EnterTestEndStates:
-					Program.MainWnd.Invoke(new EntryFormDlgt(OpenTestEndStatesDlg), this);
-					break;
-			}
-		}
-
-		/// <summary>Run this operation</summary>
-		/// <returns>Event.ResultsPrinted</returns>
-		public Event Run()
-		{
-			if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
-			{
-				return Event.ModelessFormIsOpen;
-			}
-
-			if (!resultSaved)		/// This is to save the result only once
-			{
-				if ((!entryFormCfg.EnterSerialNrsAtTheEnd && currentOp == CurrentOp.ShowFormAtCycleBeginning) ||
-					 (entryFormCfg.EnterSerialNrsAtTheEnd && currentOp == CurrentOp.ShowFormAtCycleEnd))
-				{
-					CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
-					if (dlg != null)
-					{
-					    for (int i = 0; i < Math.Min(dlg.WMsCount, waterMeters.Count); i++)
-					    {
-						    if (waterMeters[i] != null)
-						    {
-                                waterMeters[i].Disabled = disabled[i] = dlg.Disabled[i];
-                                waterMeters[i].SerialNr = dlg.SNText[i];
-                                switch (entryFormCfg.Column2Destination)
-                                {
-                                    case Col2Dest.RadioAddress:
-                                        waterMeters[i].RadioAddress = dlg.Column2Text[i];
-                                        break;
-                                    case Col2Dest.SerialNrAux:
-                                        waterMeters[i].SerialNrAux = dlg.Column2Text[i];
-                                        break;
-                                    case Col2Dest.OrderNr:
-                                        waterMeters[i].PurchaseOrder = dlg.Column2Text[i];
-                                        break;
-#if ORACLE_DB
-                                    case Col2Dest.Suffix:
-                                        waterMeters[i].Suffix = dlg.Column2Text[i];
-                                        break;
-#endif
-                                    default:
-                                    case Col2Dest.Remark:
-                                        waterMeters[i].Remark = dlg.Column2Text[i];
-                                        break;
-                                }
-
-                                if (!string.IsNullOrEmpty(dlg.PurchaseOrder) && !entryFormCfg.HideOrderSelection)
-                                {
-                                    waterMeters[i].PurchaseOrder = dlg.PurchaseOrder;
-                                }
-
-#if ORACLE_DB
-                                if (!string.IsNullOrEmpty(dlg.Prefix) && !entryFormCfg.HidePrefix)
-                                {
-                                    waterMeters[i].Prefix = dlg.PurchaseOrder;
-                                }
-#endif
-                            }
-					    }
-				    }
-				}
-				else if (entryFormCfg.ShowCycleEndForm && currentOp == CurrentOp.ShowFormAtCycleEnd)
-				{
-					CycleEndForm dlg = (modelessDlg as CycleEndForm);
-					int count = waterMeters.Count;
-					if ((dlg != null) && (count > dlg.WMsCount)) count = dlg.WMsCount;
-
-					for (int i = 0; i < count; i++)
-                    {
-                        if (waterMeters[i] != null)
-                        {
-                            /// In case entryFormCfg.ShowCycleEndForm == false dlg would be null, values would be string.Empty
-                            wmCycleEndState[i] = waterMeters[i].EndState = (dlg != null) ? dlg.EndStateText[i] : string.Empty;
-                        }
-                    }
-				}
-                else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates)
-				{
-                    /// Fixed start test - start
-					TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
-                    if (dlg != null)
-                    {
-                        for (int i = 0; i < dlg.WMsCount; i++)
-                        {
-							if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
-							{
-								wmStartState[i] = dlg.WMStartState[i];
-								wmStartStateStr[i] = dlg.WMStartStateStr[i];
-							}
-                        }
-                    }
-                }
-                else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestEndStates)
-                {
-                    /// Fixed start test - end
-                    TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
-                    if (dlg != null)
-                    {
-                        for (int i = 0; i < dlg.WMsCount; i++)
-                        {
-							if (!(((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))))
-							{
-								wmEndState[i] = dlg.WMEndState[i];
-							}
-                        }
-                    }
-                }
-                resultSaved = true;
-				modelessDlg = null;
-			}
-
-			return Event.ModelessFormClosed;		/// Form closed
-		}
-
-		/// <summary>Stop this operation</summary>
-		public void Stop()
-		{
-			if (modelessDlg is IHasCompleted)
-			{
-				UiBridge.Bridge.OnCloseModelessForm(this, null);
-				modelessDlg = null;
-			}
-			currentOp = CurrentOp.None;
-		}
-	}
-}

TBF/Rig/DataEntry/Double24/TestStartEndForm.cs

@@ -1,533 +0,0 @@
-///
-/// Copyright (c) 2021 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using log4net;
-using TBF.Rig.GenericDevices;
-using TBF.Resources;
-
-namespace TBF.Rig.DataEntry.Double24
-{
-	public partial class TestStartEndForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(TestStartEndForm));
-
-		// Set to 'true' when the form closes
-		public bool Completed { get { return completed; } }
-		bool completed;
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-        public readonly int WMsCount;
-		readonly IRegReader[] regReaders;
-		readonly bool[] disabled;
-
-		// To be retrieved after the form closes
-		public double[] WMStartState;
-
-		// To be retrieved after the form closes
-		public readonly string[] WMStartStateStr;
-
-		// To be retrieved after the form closes
-        public double[] WMEndState;
-
-		bool endStates;			/// false=start states, true=end states
-		double refVolume;
-		double warningLimLo;	/// limit to display exclamation mark, typically 2x errLimLo
-		double warningLimHi;	/// limit to display exclamation mark, typically 2x errLimHi
-        bool fixedErrorLimits;  /// false in case of calculated error limits
-
-		int TextBoxesCount;
-		///
-		Label[] labels;
-		TextBox[] startTextBoxes;
-		TextBox[] endTextBoxes;
-        Label[] exclamations;
-
-		IList<TextBox> activeTextBoxes;
-        IList<int> activeWmNrs;
-
-		/// <summary>
-		/// Parameterless constructor initializing common part for start and endstate form
-		/// </summary>
-		public TestStartEndForm()
-		{
-			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,
-				};
-			startTextBoxes = new TextBox[]
-				{
-					startTextBox1, startTextBox2, startTextBox3, startTextBox4, startTextBox5, startTextBox6,
-					startTextBox7, startTextBox8, startTextBox9, startTextBox10, startTextBox11, startTextBox12,
-					startTextBox13, startTextBox14, startTextBox15, startTextBox16, startTextBox17, startTextBox18,
-					startTextBox19, startTextBox20, startTextBox21, startTextBox22, startTextBox23, startTextBox24,
-				};
-			endTextBoxes = new TextBox[]
-				{
-					endTextBox1, endTextBox2, endTextBox3, endTextBox4, endTextBox5, endTextBox6,
-					endTextBox7, endTextBox8, endTextBox9, endTextBox10, endTextBox11, endTextBox12,
-					endTextBox13, endTextBox14, endTextBox15, endTextBox16, endTextBox17, endTextBox18,
-					endTextBox19, endTextBox20, endTextBox21, endTextBox22, endTextBox23, endTextBox24,
-				};
-            exclamations = new Label[]
-                {
-					exclamation1, exclamation2, exclamation3, exclamation4, exclamation5, exclamation6,
-					exclamation7, exclamation8, exclamation9, exclamation10, exclamation11, exclamation12,
-					exclamation13, exclamation14, exclamation15, exclamation16, exclamation17, exclamation18,
-					exclamation19, exclamation20, exclamation21, exclamation22, exclamation23, exclamation24,
-                };
-
-			activeTextBoxes = new List<TextBox>();
-            activeWmNrs = new List<int>();
-
-			completed = false;
-			StartForceCloseHandler();
-		}
-
-		/// <summary>
-		/// Constructor to fill in start states
-		/// </summary>
-		/// <param name="waterMetersCount">Number of water meters</param>
-		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
-			: this()
-		{
-			endStates = false;
-
-			this.WMsCount = waterMetersCount;
-			this.regReaders = regReaders;
-			this.disabled = disabled;
-
-			ShuffleTextBoxes();
-
-			WMStartState = new double[waterMetersCount];
-			WMStartStateStr = new string[waterMetersCount];
-		}
-
-        /// <summary>
-        /// Constructor to fill in end states
-        /// </summary>
-		/// <param name="waterMetersCount">Number of water meters</param>
-		/// <param name="wmStartStateStr">Information entered on test start</param>
-		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
-		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
-		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
-								double refVolume, double errLimLo, double errLimHi)
-			: this()
-        {
-			endStates = true;
-
-			this.WMsCount = waterMetersCount;
-			this.regReaders = regReaders;
-			if (wmStartStateStr == null || wmStartStateStr.Length != waterMetersCount)
-				throw (new Exception("Invalid 'wmStartStateStr' argument"));
-			this.WMStartStateStr = wmStartStateStr;
-			this.disabled = disabled;
-            this.refVolume = refVolume;
-            this.warningLimLo = 2 * errLimLo;
-            this.warningLimHi = 2 * errLimHi;
-            this.fixedErrorLimits = (errLimHi > errLimLo);
-
-			ShuffleTextBoxes();
-
-            WMEndState = new double[waterMetersCount];
-		}
-
-		/// <summary>
-		/// Make sure the layout of labels/text boxes on the screen
-		/// corresponds to the layout of watermeters of the test bench.
-		/// </summary>
-		void ShuffleTextBoxes()
-		{
-			if (TextBoxesCount > WMsCount)
-			{
-				int nrLines = WMsCount / TBF.Data.LineSize;
-				int gap = (TextBoxesCount - WMsCount) / nrLines;
-
-				int dest = 0;
-				for (int l = 0; l < nrLines; l++)
-				{
-					for (int i = 0; i < TBF.Data.LineSize; i++)
-					{
-						labels[dest] = labels[l * TBF.Data.LineSize + l * gap + i];
-						startTextBoxes[dest] = startTextBoxes[l * TBF.Data.LineSize + l * gap + i];
-						endTextBoxes[dest] = endTextBoxes[l * TBF.Data.LineSize + l * gap + i];
-                        exclamations[dest] = exclamations[l * TBF.Data.LineSize + l * gap + i];
-                        dest++;
-					}
-				}
-				TextBoxesCount = WMsCount;
-			}
-		}
-
-		private void CycleEndForm_Load(object sender, EventArgs e)
-		{
-            Localize();
-
-            //Height = 115 + 90 * WaterMetersCount;
-
-			for (int i = 0; i < TextBoxesCount; i++)
-			{
-				if (i < WMsCount)
-				{
-					labels[i].Visible = startTextBoxes[i].Visible = endTextBoxes[i].Visible = true;
-				}
-			}
-
-            if (endStates)
-			{
-                /// End of test
-				for (int i = 0; i < TextBoxesCount; i++)
-				{
-					if (WMStartStateStr != null && i < WMStartStateStr.Length)
-					{
-						startTextBoxes[i].Text = WMStartStateStr[i];
-					}
-
-					if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
-					{
-						endTextBoxes[i].Enabled = false;
-					}
-					else
-					{
-						endTextBoxes[i].Enabled = true;
-						activeTextBoxes.Add(endTextBoxes[i]);
-                        activeWmNrs.Add(i);
-                    }
-				}
-			}
-			else
-			{ 
-                /// Start of test
-				for (int i = 0; i < TextBoxesCount; i++)
-				{
-					if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
-					{
-						startTextBoxes[i].Enabled = false;
-					}
-					else
-					{
-						startTextBoxes[i].Enabled = true;
-						activeTextBoxes.Add(startTextBoxes[i]);
-                        activeWmNrs.Add(i);
-                    }
-				}
-			}
-
-            if ((activeTextBoxes.Count > 0) && (activeWmNrs.Count > 0))
-            {
-                activeTextBoxes[0].Focus();
-                largeTextBox.Text = string.Format("{0} {1}:   {2}", Strings.Water_Meter, activeWmNrs[0] + 1, string.Empty);
-            }
-		}
-
-		void Localize()
-		{
-			Text = Strings.Water_Meter_States;
-			for (int i = 0; i < TextBoxesCount; i++)
-			{
-				labels[i].Text = string.Format("{0} {1}", Strings.Water_Meter, i + 1);
-			}
-			startLabel.Text = startLabel2.Text = Strings.Start;
-			endLabel.Text = endLabel2.Text = Strings.End;
-			okButton.Text = Strings.OkBtnText;
-		}
-
-		private void okButton_Click(object sender, EventArgs eArgs)
-		{
-            try
-            {
-				if (endStates)
-				{
-					for (int i = 0; i < Math.Min(WMsCount, TextBoxesCount); i++)
-					{
-						if (endTextBoxes[i].Visible && endTextBoxes[i].Enabled)
-						{
-							WMEndState[i] = Utils.ParseUDouble(endTextBoxes[i].Text);
-						}
-					}
-				}
-				else
-				{
-					for (int i = 0; i < Math.Min(WMsCount, TextBoxesCount); i++)
-					{
-						if (startTextBoxes[i].Visible && startTextBoxes[i].Enabled)
-						{
-							WMStartStateStr[i] = startTextBoxes[i].Text;
-							WMStartState[i] = Utils.ParseUDouble(startTextBoxes[i].Text);
-						}
-					}
-				}
-			}
-            catch(Exception e)
-            {
-				log.ErrorFormat("Exception: {0}", e.Message);
-                return;
-            }
-
-			completed = true;
-			Close();
-		}
-
-		#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);
-			};
-		}
-
-		void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-
-
-        /// <summary>
-        /// Calculate the approximate error and verify whether it is within limits.
-        /// Make an exclamation mark visible if out of range.
-        /// Similar event handler is implemented for all endTextBoxes (1..24).
-        /// </summary>
-        private void ProcEndTextChanged(object sender, EventArgs e, TextBox endTBox)
-        {
-            int wmIx = -1;
-            for (int i = 0; i < endTextBoxes.Length; i++)
-            {
-                if (endTextBoxes[i] == endTBox)
-                {
-                    wmIx = i;
-                    break;
-                }
-            }
-
-            double err = 0;
-            try
-            {
-                double endState = Utils.ParseUDouble(endTextBoxes[wmIx].Text);
-                double startState = Utils.ParseUDouble(startTextBoxes[wmIx].Text);
-                err = 100.0 * (endState - startState - refVolume) / refVolume;
-            }
-            catch { err = 1000.0f; };
-
-            bool errorOoR = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
-            exclamations[wmIx].Visible = errorOoR;
-            largeExclamationLabel.Visible = errorOoR;
-            largeTextBox.Text = string.Format("{0} {1}:   {2}", Strings.Water_Meter, wmIx + 1, endTextBoxes[wmIx].Text);
-        }
-
-        private void endTextBox1_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox1); }
-        private void endTextBox2_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox2); }
-        private void endTextBox3_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox3); }
-        private void endTextBox4_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox4); }
-        private void endTextBox5_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox5); }
-        private void endTextBox6_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox6); }
-        private void endTextBox7_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox7); }
-        private void endTextBox8_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox8); }
-        private void endTextBox9_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox9); }
-        private void endTextBox10_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox10); }
-        private void endTextBox11_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox11); }
-        private void endTextBox12_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox12); }
-        private void endTextBox13_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox13); }
-        private void endTextBox14_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox14); }
-        private void endTextBox15_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox15); }
-        private void endTextBox16_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox16); }
-        private void endTextBox17_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox17); }
-        private void endTextBox18_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox18); }
-        private void endTextBox19_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox19); }
-        private void endTextBox20_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox20); }
-        private void endTextBox21_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox21); }
-        private void endTextBox22_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox22); }
-        private void endTextBox23_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox23); }
-        private void endTextBox24_TextChanged(object sndr, EventArgs e) { ProcEndTextChanged(sndr, e, endTextBox24); }
-
-        private void endTextBox1_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox1); }
-        private void endTextBox2_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox2); }
-        private void endTextBox3_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox3); }
-        private void endTextBox4_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox4); }
-        private void endTextBox5_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox5); }
-        private void endTextBox6_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox6); }
-        private void endTextBox7_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox7); }
-        private void endTextBox8_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox8); }
-        private void endTextBox9_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox9); }
-        private void endTextBox10_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox10); }
-        private void endTextBox11_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox11); }
-        private void endTextBox12_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox12); }
-        private void endTextBox13_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox13); }
-        private void endTextBox14_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox14); }
-        private void endTextBox15_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox15); }
-        private void endTextBox16_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox16); }
-        private void endTextBox17_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox17); }
-        private void endTextBox18_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox18); }
-        private void endTextBox19_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox19); }
-        private void endTextBox20_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox20); }
-        private void endTextBox21_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox21); }
-        private void endTextBox22_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox22); }
-        private void endTextBox23_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox23); }
-        private void endTextBox24_MouseClick(object sender, MouseEventArgs e) { ProcEndTextChanged(sender, e, endTextBox24); }
-
-		/// <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, TextBox currentFocusOwner)
-		{
-			if (e.KeyChar == '+')
-			{
-				/// Process '+' key ..... Form completed
-				okButton_Click(sender, e);
-			}
-
-            if (e.KeyChar == '\r')
-            {
-                /// Process <enter> key ..... Next text field
-                if (activeTextBoxes.Count < 2) return;		/// There is just one enabled textbox
-
-                for (int i = 0; i < activeTextBoxes.Count; i++)
-                {
-                    if (activeTextBoxes[i] == currentFocusOwner)
-                    {
-                        /// Change focus to the next enabled text box
-                        int newTBIdx = (i + 1) % activeTextBoxes.Count;
-                        activeTextBoxes[newTBIdx].Focus();
-                        largeTextBox.Text = string.Format("{0} {1}:   {2}", Strings.Water_Meter, activeWmNrs[newTBIdx] + 1, activeTextBoxes[newTBIdx].Text);
-                        largeExclamationLabel.Visible = false;
-                        return;
-                    }
-                }
-            }
-		}
-
-		private void startTextBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox1); }
-		private void startTextBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox2); }
-		private void startTextBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox3); }
-		private void startTextBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox4); }
-		private void startTextBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox5); }
-		private void startTextBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox6); }
-		private void startTextBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox7); }
-		private void startTextBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox8); }
-		private void startTextBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox9); }
-		private void startTextBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox10); }
-		private void startTextBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox11); }
-		private void startTextBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox12); }
-		private void startTextBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox13); }
-		private void startTextBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox14); }
-		private void startTextBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox15); }
-		private void startTextBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox16); }
-		private void startTextBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox17); }
-		private void startTextBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox18); }
-		private void startTextBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox19); }
-		private void startTextBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox20); }
-		private void startTextBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox21); }
-		private void startTextBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox22); }
-		private void startTextBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox23); }
-		private void startTextBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, startTextBox24); }
-
-        private void endTextBox1_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox1); }
-        private void endTextBox2_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox2); }
-        private void endTextBox3_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox3); }
-        private void endTextBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox4); }
-        private void endTextBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox5); }
-        private void endTextBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox6); }
-        private void endTextBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox7); }
-        private void endTextBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox8); }
-        private void endTextBox9_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox9); }
-		private void endTextBox10_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox10); }
-		private void endTextBox11_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox11); }
-		private void endTextBox12_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox12); }
-		private void endTextBox13_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox13); }
-		private void endTextBox14_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox14); }
-		private void endTextBox15_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox15); }
-		private void endTextBox16_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox16); }
-		private void endTextBox17_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox17); }
-		private void endTextBox18_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox18); }
-		private void endTextBox19_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox19); }
-		private void endTextBox20_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox20); }
-		private void endTextBox21_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox21); }
-		private void endTextBox22_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox22); }
-		private void endTextBox23_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox23); }
-		private void endTextBox24_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, endTextBox24); }
-
-
-        private void ProcStartTextChanged(object sender, EventArgs e, TextBox startTBox)
-        {
-            for (int i = 0; i < startTextBoxes.Length; i++)
-            {
-                if (startTextBoxes[i] == startTBox)
-                {
-                    largeTextBox.Text = string.Format("{0} {1}:   {2}", Strings.Water_Meter, i + 1, startTextBoxes[i].Text);
-                    largeExclamationLabel.Visible = false;
-                    break;
-                }
-            }
-        }
-
-        private void startTextBox1_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox1); }
-        private void startTextBox2_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox2); }
-        private void startTextBox3_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox3); }
-        private void startTextBox4_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox4); }
-        private void startTextBox5_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox5); }
-        private void startTextBox6_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox6); }
-        private void startTextBox7_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox7); }
-        private void startTextBox8_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox8); }
-        private void startTextBox9_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox9); }
-        private void startTextBox10_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox10); }
-        private void startTextBox11_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox11); }
-        private void startTextBox12_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox12); }
-        private void startTextBox13_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox13); }
-        private void startTextBox14_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox14); }
-        private void startTextBox15_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox15); }
-        private void startTextBox16_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox16); }
-        private void startTextBox17_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox17); }
-        private void startTextBox18_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox18); }
-        private void startTextBox19_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox19); }
-        private void startTextBox20_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox20); }
-        private void startTextBox21_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox21); }
-        private void startTextBox22_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox22); }
-        private void startTextBox23_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox23); }
-        private void startTextBox24_TextChanged(object sender, EventArgs e) { ProcStartTextChanged(sender, e, startTextBox24); }
-
-        private void startTextBox1_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox1); }
-        private void startTextBox2_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox2); }
-        private void startTextBox3_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox3); }
-        private void startTextBox4_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox4); }
-        private void startTextBox5_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox5); }
-        private void startTextBox6_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox6); }
-        private void startTextBox7_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox7); }
-        private void startTextBox8_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox8); }
-        private void startTextBox9_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox9); }
-        private void startTextBox10_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox10); }
-        private void startTextBox11_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox11); }
-        private void startTextBox12_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox12); }
-        private void startTextBox13_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox13); }
-        private void startTextBox14_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox14); }
-        private void startTextBox15_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox15); }
-        private void startTextBox16_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox16); }
-        private void startTextBox17_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox17); }
-        private void startTextBox18_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox18); }
-        private void startTextBox19_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox19); }
-        private void startTextBox20_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox20); }
-        private void startTextBox21_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox21); }
-        private void startTextBox22_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox22); }
-        private void startTextBox23_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox23); }
-        private void startTextBox24_MouseClick(object sender, MouseEventArgs e) { ProcStartTextChanged(sender, e, startTextBox24); }
-    }
-}