diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index b24b30552..b2351094c 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.5.2015.0")]
-[assembly: AssemblyFileVersion("3.5.2015.0")]
+[assembly: AssemblyVersion("3.5.2024.0")]
+[assembly: AssemblyFileVersion("3.5.2024.0")]
diff --git a/TBF/Rig/DataEntry/Standard24/CycleEndForm.Designer.cs b/TBF/Rig/DataEntry/Standard24/CycleEndForm.Designer.cs
index 760991f87..3cafa6d00 100644
--- a/TBF/Rig/DataEntry/Standard24/CycleEndForm.Designer.cs
+++ b/TBF/Rig/DataEntry/Standard24/CycleEndForm.Designer.cs
@@ -1,5 +1,5 @@
///
-/// Copyright (c) 2015 Sensus Metering Systems
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
///
namespace TBF.Rig.DataEntry.Standard24
{
@@ -84,10 +84,10 @@ namespace TBF.Rig.DataEntry.Standard24
//
// textBox2
//
- this.textBox2.Location = new System.Drawing.Point(205, 66);
+ this.textBox2.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox2.TabIndex = 1;
//
// label2
@@ -96,16 +96,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(18, 18);
this.label2.TabIndex = 0;
- this.label2.Text = "Stand:";
+ this.label2.Text = "2";
//
// textBox1
//
- this.textBox1.Location = new System.Drawing.Point(205, 30);
+ this.textBox1.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox1.TabIndex = 1;
//
// label1
@@ -114,19 +114,19 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(18, 18);
this.label1.TabIndex = 0;
- this.label1.Text = "Stand:";
+ this.label1.Text = "1";
//
// 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.Location = new System.Drawing.Point(666, 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.Size = new System.Drawing.Size(101, 60);
this.okButton.TabIndex = 7;
this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true;
@@ -134,10 +134,10 @@ namespace TBF.Rig.DataEntry.Standard24
//
// textBox3
//
- this.textBox3.Location = new System.Drawing.Point(205, 102);
+ this.textBox3.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox3.TabIndex = 1;
//
// label3
@@ -146,16 +146,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(18, 18);
this.label3.TabIndex = 0;
- this.label3.Text = "Stand:";
+ this.label3.Text = "3";
//
// textBox4
//
- this.textBox4.Location = new System.Drawing.Point(205, 138);
+ this.textBox4.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox4.TabIndex = 1;
//
// label4
@@ -164,16 +164,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(18, 18);
this.label4.TabIndex = 0;
- this.label4.Text = "Stand:";
+ this.label4.Text = "4";
//
// textBox5
//
- this.textBox5.Location = new System.Drawing.Point(205, 174);
+ this.textBox5.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox5.TabIndex = 1;
//
// label5
@@ -182,16 +182,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(18, 18);
this.label5.TabIndex = 0;
- this.label5.Text = "Stand:";
+ this.label5.Text = "5";
//
// textBox6
//
- this.textBox6.Location = new System.Drawing.Point(205, 210);
+ this.textBox6.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox6.TabIndex = 1;
//
// label6
@@ -200,16 +200,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(18, 18);
this.label6.TabIndex = 0;
- this.label6.Text = "Stand:";
+ this.label6.Text = "6";
//
// textBox7
//
- this.textBox7.Location = new System.Drawing.Point(205, 246);
+ this.textBox7.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox7.TabIndex = 9;
//
// label7
@@ -218,16 +218,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(18, 18);
this.label7.TabIndex = 8;
- this.label7.Text = "Stand:";
+ this.label7.Text = "7";
//
// textBox8
//
- this.textBox8.Location = new System.Drawing.Point(205, 282);
+ this.textBox8.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox8.TabIndex = 11;
//
// label8
@@ -236,16 +236,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(18, 18);
this.label8.TabIndex = 10;
- this.label8.Text = "Stand:";
+ this.label8.Text = "8";
//
// textBox9
//
- this.textBox9.Location = new System.Drawing.Point(205, 318);
+ this.textBox9.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox9.TabIndex = 13;
//
// label9
@@ -254,16 +254,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(18, 18);
this.label9.TabIndex = 12;
- this.label9.Text = "Stand:";
+ this.label9.Text = "9";
//
// textBox10
//
- this.textBox10.Location = new System.Drawing.Point(205, 354);
+ this.textBox10.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox10.TabIndex = 15;
//
// label10
@@ -272,16 +272,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(28, 18);
this.label10.TabIndex = 14;
- this.label10.Text = "Stand:";
+ this.label10.Text = "10";
//
// textBox11
//
- this.textBox11.Location = new System.Drawing.Point(205, 390);
+ this.textBox11.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox11.TabIndex = 17;
//
// label11
@@ -290,16 +290,16 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(28, 18);
this.label11.TabIndex = 16;
- this.label11.Text = "Stand:";
+ this.label11.Text = "11";
//
// textBox12
//
- this.textBox12.Location = new System.Drawing.Point(205, 426);
+ this.textBox12.Location = new System.Drawing.Point(105, 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.Size = new System.Drawing.Size(200, 27);
this.textBox12.TabIndex = 19;
//
// label12
@@ -308,232 +308,232 @@ namespace TBF.Rig.DataEntry.Standard24
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.Size = new System.Drawing.Size(28, 18);
this.label12.TabIndex = 18;
- this.label12.Text = "Stand:";
+ this.label12.Text = "12";
//
// textBox13
//
- this.textBox13.Location = new System.Drawing.Point(623, 30);
+ this.textBox13.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox13.TabIndex = 21;
//
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(456, 35);
+ this.label13.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label13.TabIndex = 20;
- this.label13.Text = "Stand:";
+ this.label13.Text = "13";
//
// textBox14
//
- this.textBox14.Location = new System.Drawing.Point(623, 66);
+ this.textBox14.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox14.TabIndex = 23;
//
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(456, 71);
+ this.label14.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label14.TabIndex = 22;
- this.label14.Text = "Stand:";
+ this.label14.Text = "14";
//
// textBox15
//
- this.textBox15.Location = new System.Drawing.Point(623, 102);
+ this.textBox15.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox15.TabIndex = 25;
//
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(456, 107);
+ this.label15.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label15.TabIndex = 24;
- this.label15.Text = "Stand:";
+ this.label15.Text = "15";
//
// textBox16
//
- this.textBox16.Location = new System.Drawing.Point(623, 138);
+ this.textBox16.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox16.TabIndex = 27;
//
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(456, 143);
+ this.label16.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label16.TabIndex = 26;
- this.label16.Text = "Stand:";
+ this.label16.Text = "16";
//
// textBox17
//
- this.textBox17.Location = new System.Drawing.Point(623, 174);
+ this.textBox17.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox17.TabIndex = 29;
//
// label17
//
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(456, 179);
+ this.label17.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label17.TabIndex = 28;
- this.label17.Text = "Stand:";
+ this.label17.Text = "17";
//
// textBox18
//
- this.textBox18.Location = new System.Drawing.Point(623, 210);
+ this.textBox18.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox18.TabIndex = 31;
//
// label18
//
this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(456, 215);
+ this.label18.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label18.TabIndex = 30;
- this.label18.Text = "Stand:";
+ this.label18.Text = "18";
//
// textBox19
//
- this.textBox19.Location = new System.Drawing.Point(623, 246);
+ this.textBox19.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox19.TabIndex = 33;
//
// label19
//
this.label19.AutoSize = true;
- this.label19.Location = new System.Drawing.Point(456, 251);
+ this.label19.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label19.TabIndex = 32;
- this.label19.Text = "Stand:";
+ this.label19.Text = "19";
//
// textBox20
//
- this.textBox20.Location = new System.Drawing.Point(623, 282);
+ this.textBox20.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox20.TabIndex = 35;
//
// label20
//
this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(456, 287);
+ this.label20.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label20.TabIndex = 34;
- this.label20.Text = "Stand:";
+ this.label20.Text = "20";
//
// textBox21
//
- this.textBox21.Location = new System.Drawing.Point(623, 318);
+ this.textBox21.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox21.TabIndex = 37;
//
// label21
//
this.label21.AutoSize = true;
- this.label21.Location = new System.Drawing.Point(456, 323);
+ this.label21.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label21.TabIndex = 36;
- this.label21.Text = "Stand:";
+ this.label21.Text = "21";
//
// textBox22
//
- this.textBox22.Location = new System.Drawing.Point(623, 354);
+ this.textBox22.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox22.TabIndex = 39;
//
// label22
//
this.label22.AutoSize = true;
- this.label22.Location = new System.Drawing.Point(456, 359);
+ this.label22.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label22.TabIndex = 38;
- this.label22.Text = "Stand:";
+ this.label22.Text = "22";
//
// textBox23
//
- this.textBox23.Location = new System.Drawing.Point(623, 390);
+ this.textBox23.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox23.TabIndex = 41;
//
// label23
//
this.label23.AutoSize = true;
- this.label23.Location = new System.Drawing.Point(456, 395);
+ this.label23.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label23.TabIndex = 40;
- this.label23.Text = "Stand:";
+ this.label23.Text = "23";
//
// textBox24
//
- this.textBox24.Location = new System.Drawing.Point(623, 426);
+ this.textBox24.Location = new System.Drawing.Point(425, 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.Size = new System.Drawing.Size(200, 27);
this.textBox24.TabIndex = 43;
//
// label24
//
this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(456, 431);
+ this.label24.Location = new System.Drawing.Point(358, 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.Size = new System.Drawing.Size(28, 18);
this.label24.TabIndex = 42;
- this.label24.Text = "Stand:";
+ this.label24.Text = "24";
//
// 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.ClientSize = new System.Drawing.Size(804, 489);
this.Controls.Add(this.textBox24);
this.Controls.Add(this.label24);
this.Controls.Add(this.textBox23);
@@ -588,7 +588,6 @@ namespace TBF.Rig.DataEntry.Standard24
this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.Name = "CycleEndForm";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Daten";
this.TopMost = true;
this.Load += new System.EventHandler(this.CycleEndForm_Load);
diff --git a/TBF/Rig/DataEntry/Standard24/CycleEndForm.cs b/TBF/Rig/DataEntry/Standard24/CycleEndForm.cs
index e0827685c..bcbc84fb1 100644
--- a/TBF/Rig/DataEntry/Standard24/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard24/CycleEndForm.cs
@@ -1,5 +1,5 @@
///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
///
using System;
using System.Windows.Forms;
@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.Standard24
private static readonly ILog log = LogManager.GetLogger(typeof(CycleEndForm));
/// Number of text boxes for serial numbers
- public readonly int WaterMetersCount;
+ public readonly int WMsCount;
readonly int lineSize;
// To be retrieved after the form closes
@@ -51,21 +51,19 @@ namespace TBF.Rig.DataEntry.Standard24
textBox19, textBox20, textBox21, textBox22, textBox23, textBox24,
};
textBoxesCount = textBoxes.Length;
- this.WaterMetersCount = textBoxesCount;
- this.lineSize = textBoxesCount / 2;
completed = false;
StartForceCloseHandler();
}
/// Parameterless constructor for 3 watermeters
- public CycleEndForm(int waterMetersCount, int lineSize)
+ public CycleEndForm(int wmsCount, int lineSize)
: this()
{
- this.WaterMetersCount = waterMetersCount;
+ this.WMsCount = wmsCount;
this.lineSize = lineSize;
- ShuffleTextBoxes(waterMetersCount, lineSize);
- EndStateText = new string[WaterMetersCount];
+ ShuffleTextBoxes(wmsCount, lineSize);
+ EndStateText = new string[WMsCount];
}
///
@@ -103,7 +101,7 @@ namespace TBF.Rig.DataEntry.Standard24
for (int i = 0; i < textBoxesCount; i++)
{
- if (i >= WaterMetersCount)
+ if (i >= WMsCount)
{
labels[i].Visible = false;
textBoxes[i].Visible = false;
@@ -116,15 +114,15 @@ namespace TBF.Rig.DataEntry.Standard24
Text = Strings.Data;
okButton.Text = Strings.OkBtnText;
- for (int i = 0; i < WaterMetersCount; i++)
+ for (int i = 0; i < WMsCount; i++)
{
- labels[i].Text = string.Format("{0} {1}:", Strings.Water_Meter, (i + 1).ToString());
+ labels[i].Text = string.Format("{0}", (i + 1).ToString());
}
}
private void okButton_Click(object sender, EventArgs e)
{
- for (int i = 0; i < WaterMetersCount; i++)
+ for (int i = 0; i < WMsCount; i++)
{
EndStateText[i] = textBoxes[i].Text;
}
diff --git a/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs b/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs
index 9a807bcb9..d351d98c6 100644
--- a/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs
+++ b/TBF/Rig/DataEntry/Standard24/EntryFormNoStartEnd.cs
@@ -240,7 +240,7 @@ namespace TBF.Rig.DataEntry.Standard24
{
CycleEndForm dlg = (modelessDlg as CycleEndForm);
int count = waterMeters.Count;
- if ((dlg != null) && (count > dlg.WaterMetersCount)) count = dlg.WaterMetersCount;
+ if ((dlg != null) && (count > dlg.WMsCount)) count = dlg.WMsCount;
for (int i = 0; i < count; i++)
{