diff --git a/Results/ItemID.cs b/Results/ItemID.cs index e9ea2d455..33086372f 100644 --- a/Results/ItemID.cs +++ b/Results/ItemID.cs @@ -268,6 +268,8 @@ namespace Results LastError, /// 230 For iPerl previous test result (test with Proefindex-1) OrigCalibFactorLNA, /// 231 CalibFactorLNA, /// 232 + + WM_remark, /// 233 Count, } diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 6d083b682..e1aa8bfb9 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.18.1041.0")] -[assembly: AssemblyFileVersion("2.18.1041.0")] +[assembly: AssemblyVersion("2.18.1076.0")] +[assembly: AssemblyFileVersion("2.18.1076.0")] diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs index cc4a58c15..6428c450a 100644 --- a/Results/Resources/Strings.Designer.cs +++ b/Results/Resources/Strings.Designer.cs @@ -114,6 +114,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Batch. + /// + internal static string Batch { + get { + return ResourceManager.GetString("Batch", resourceCulture); + } + } + /// /// Looks up a localized string similar to Batch nr.. /// diff --git a/Results/Resources/Strings.cs.resx b/Results/Resources/Strings.cs.resx index c8f2c7b07..8ca32d212 100644 --- a/Results/Resources/Strings.cs.resx +++ b/Results/Resources/Strings.cs.resx @@ -252,4 +252,7 @@ Adresa + + Dávka + \ No newline at end of file diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx index c7829953b..e76c6f850 100644 --- a/Results/Resources/Strings.resx +++ b/Results/Resources/Strings.resx @@ -738,4 +738,7 @@ Relative error of a meter in previous test/in production + + Batch + \ No newline at end of file diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index b3a1020bd..cff38e76b 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -401,8 +401,9 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed_seals_count, "Seals count of passed meters", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.PassedMetersCount() * int.Parse(w.WaterMeterData.Text5)))); /// Extra water meter data - AllItems.Add(new WMeterRsltItemSpec(ItemID.Result_code, Strings.Result_code, Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ResultCode))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark, Strings.Remark, Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => FormatStr(f, w.Batch.Remark))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Result_code, Strings.Result_code, Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.ResultCode))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_remark, string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark), Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.Remark))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Remark, string.Format("{0} {1}", Strings.Batch, Strings.Remark), Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => FormatStr(f, w.Batch.Remark))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type, Strings.Meter_type, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single)))); #if HEAT_METERS diff --git a/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs index 235471ed9..55e987414 100644 --- a/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs +++ b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs @@ -31,328 +31,297 @@ namespace TBF.BenchControl.DataEntry.Standard6 /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm)); - this.okButton = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.comboBox2 = new System.Windows.Forms.ComboBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.comboBox3 = new System.Windows.Forms.ComboBox(); - this.checkBox7 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.label3 = new System.Windows.Forms.Label(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.comboBox4 = new System.Windows.Forms.ComboBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); - this.label4 = new System.Windows.Forms.Label(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.comboBox5 = new System.Windows.Forms.ComboBox(); - this.checkBox5 = new System.Windows.Forms.CheckBox(); - this.label5 = new System.Windows.Forms.Label(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.comboBox6 = new System.Windows.Forms.ComboBox(); - this.checkBox6 = new System.Windows.Forms.CheckBox(); - this.label6 = new System.Windows.Forms.Label(); - this.orderGroupBox = new System.Windows.Forms.GroupBox(); - this.orderComboBox = new System.Windows.Forms.ComboBox(); - this.clearButton = new System.Windows.Forms.Button(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.orderGroupBox.SuspendLayout(); - this.SuspendLayout(); - // - // okButton - // - resources.ApplyResources(this.okButton, "okButton"); - this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Name = "okButton"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.comboBox1); - this.groupBox1.Controls.Add(this.checkBox1); - this.groupBox1.Controls.Add(this.label1); - resources.ApplyResources(this.groupBox1, "groupBox1"); - this.groupBox1.ForeColor = System.Drawing.Color.Black; - this.groupBox1.Name = "groupBox1"; - this.groupBox1.TabStop = false; - // - // comboBox1 - // - this.comboBox1.FormattingEnabled = true; - resources.ApplyResources(this.comboBox1, "comboBox1"); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); - this.comboBox1.TextChanged += new System.EventHandler(this.comboBox1_TextChanged); - this.comboBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox1_KeyPress); - // - // checkBox1 - // - resources.ApplyResources(this.checkBox1, "checkBox1"); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.UseVisualStyleBackColor = true; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.comboBox2); - this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.label2); - resources.ApplyResources(this.groupBox2, "groupBox2"); - this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Name = "groupBox2"; - this.groupBox2.TabStop = false; - // - // comboBox2 - // - this.comboBox2.FormattingEnabled = true; - resources.ApplyResources(this.comboBox2, "comboBox2"); - this.comboBox2.Name = "comboBox2"; - this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged); - this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); - this.comboBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox2_KeyPress); - // - // checkBox2 - // - resources.ApplyResources(this.checkBox2, "checkBox2"); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.UseVisualStyleBackColor = true; - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.Name = "label2"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.comboBox3); - this.groupBox3.Controls.Add(this.checkBox7); - this.groupBox3.Controls.Add(this.checkBox3); - this.groupBox3.Controls.Add(this.label3); - resources.ApplyResources(this.groupBox3, "groupBox3"); - this.groupBox3.ForeColor = System.Drawing.Color.Black; - this.groupBox3.Name = "groupBox3"; - this.groupBox3.TabStop = false; - // - // comboBox3 - // - this.comboBox3.FormattingEnabled = true; - resources.ApplyResources(this.comboBox3, "comboBox3"); - this.comboBox3.Name = "comboBox3"; - this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged); - this.comboBox3.TextChanged += new System.EventHandler(this.comboBox3_TextChanged); - this.comboBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox3_KeyPress); - // - // checkBox7 - // - resources.ApplyResources(this.checkBox7, "checkBox7"); - this.checkBox7.Name = "checkBox7"; - this.checkBox7.UseVisualStyleBackColor = true; - // - // checkBox3 - // - resources.ApplyResources(this.checkBox3, "checkBox3"); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.UseVisualStyleBackColor = true; - // - // label3 - // - resources.ApplyResources(this.label3, "label3"); - this.label3.Name = "label3"; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.comboBox4); - this.groupBox4.Controls.Add(this.checkBox4); - this.groupBox4.Controls.Add(this.label4); - resources.ApplyResources(this.groupBox4, "groupBox4"); - this.groupBox4.ForeColor = System.Drawing.Color.Black; - this.groupBox4.Name = "groupBox4"; - this.groupBox4.TabStop = false; - // - // comboBox4 - // - this.comboBox4.FormattingEnabled = true; - resources.ApplyResources(this.comboBox4, "comboBox4"); - this.comboBox4.Name = "comboBox4"; - this.comboBox4.SelectedIndexChanged += new System.EventHandler(this.comboBox4_SelectedIndexChanged); - this.comboBox4.TextChanged += new System.EventHandler(this.comboBox4_TextChanged); - this.comboBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox4_KeyPress); - // - // checkBox4 - // - resources.ApplyResources(this.checkBox4, "checkBox4"); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.UseVisualStyleBackColor = true; - // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.Name = "label4"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.comboBox5); - this.groupBox5.Controls.Add(this.checkBox5); - this.groupBox5.Controls.Add(this.label5); - resources.ApplyResources(this.groupBox5, "groupBox5"); - this.groupBox5.ForeColor = System.Drawing.Color.Black; - this.groupBox5.Name = "groupBox5"; - this.groupBox5.TabStop = false; - // - // comboBox5 - // - this.comboBox5.FormattingEnabled = true; - resources.ApplyResources(this.comboBox5, "comboBox5"); - this.comboBox5.Name = "comboBox5"; - this.comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox5_SelectedIndexChanged); - this.comboBox5.TextChanged += new System.EventHandler(this.comboBox5_TextChanged); - this.comboBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox5_KeyPress); - // - // checkBox5 - // - resources.ApplyResources(this.checkBox5, "checkBox5"); - this.checkBox5.Name = "checkBox5"; - this.checkBox5.UseVisualStyleBackColor = true; - // - // label5 - // - resources.ApplyResources(this.label5, "label5"); - this.label5.Name = "label5"; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.comboBox6); - this.groupBox6.Controls.Add(this.checkBox6); - this.groupBox6.Controls.Add(this.label6); - resources.ApplyResources(this.groupBox6, "groupBox6"); - this.groupBox6.ForeColor = System.Drawing.Color.Black; - this.groupBox6.Name = "groupBox6"; - this.groupBox6.TabStop = false; - // - // comboBox6 - // - this.comboBox6.FormattingEnabled = true; - resources.ApplyResources(this.comboBox6, "comboBox6"); - this.comboBox6.Name = "comboBox6"; - this.comboBox6.SelectedIndexChanged += new System.EventHandler(this.comboBox6_SelectedIndexChanged); - this.comboBox6.TextChanged += new System.EventHandler(this.comboBox6_TextChanged); - this.comboBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox6_KeyPress); - // - // checkBox6 - // - resources.ApplyResources(this.checkBox6, "checkBox6"); - this.checkBox6.Name = "checkBox6"; - this.checkBox6.UseVisualStyleBackColor = true; - // - // label6 - // - resources.ApplyResources(this.label6, "label6"); - this.label6.Name = "label6"; - // - // orderGroupBox - // - this.orderGroupBox.Controls.Add(this.orderComboBox); - resources.ApplyResources(this.orderGroupBox, "orderGroupBox"); - this.orderGroupBox.ForeColor = System.Drawing.Color.Black; - this.orderGroupBox.Name = "orderGroupBox"; - this.orderGroupBox.TabStop = false; - // - // orderComboBox - // - this.orderComboBox.FormattingEnabled = true; - resources.ApplyResources(this.orderComboBox, "orderComboBox"); - this.orderComboBox.Name = "orderComboBox"; - // - // clearButton - // - resources.ApplyResources(this.clearButton, "clearButton"); - this.clearButton.ForeColor = System.Drawing.Color.Black; - this.clearButton.Name = "clearButton"; - this.clearButton.UseVisualStyleBackColor = true; - this.clearButton.Click += new System.EventHandler(this.clearButton_Click); - // - // CycleBeginningForm - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.Controls.Add(this.clearButton); - this.Controls.Add(this.orderGroupBox); - this.Controls.Add(this.groupBox6); - this.Controls.Add(this.groupBox5); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.okButton); - this.ForeColor = System.Drawing.Color.Black; - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "CycleBeginningForm"; - this.TopMost = true; - this.Load += new System.EventHandler(this.CycleBeginningForm_Load); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox4.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - this.orderGroupBox.ResumeLayout(false); - this.ResumeLayout(false); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm)); + this.okButton = new System.Windows.Forms.Button(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.label1 = new System.Windows.Forms.Label(); + this.clearButton = new System.Windows.Forms.Button(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.label2 = new System.Windows.Forms.Label(); + this.comboBox3 = new System.Windows.Forms.ComboBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.label3 = new System.Windows.Forms.Label(); + this.comboBox4 = new System.Windows.Forms.ComboBox(); + this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.label4 = new System.Windows.Forms.Label(); + this.comboBox5 = new System.Windows.Forms.ComboBox(); + this.checkBox5 = new System.Windows.Forms.CheckBox(); + this.label5 = new System.Windows.Forms.Label(); + this.comboBox6 = new System.Windows.Forms.ComboBox(); + this.checkBox6 = new System.Windows.Forms.CheckBox(); + this.label6 = new System.Windows.Forms.Label(); + this.remarkTextBox6 = new System.Windows.Forms.TextBox(); + this.remarkTextBox5 = new System.Windows.Forms.TextBox(); + this.remarkTextBox4 = new System.Windows.Forms.TextBox(); + this.remarkTextBox3 = new System.Windows.Forms.TextBox(); + this.remarkTextBox2 = new System.Windows.Forms.TextBox(); + this.remarkTextBox1 = new System.Windows.Forms.TextBox(); + this.orderComboBox = new System.Windows.Forms.ComboBox(); + this.orderLabel = new System.Windows.Forms.Label(); + this.snLabel = new System.Windows.Forms.Label(); + this.remarkLabel = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // okButton + // + resources.ApplyResources(this.okButton, "okButton"); + this.okButton.ForeColor = System.Drawing.Color.Black; + this.okButton.Name = "okButton"; + this.okButton.UseVisualStyleBackColor = true; + this.okButton.Click += new System.EventHandler(this.okButton_Click); + // + // comboBox1 + // + resources.ApplyResources(this.comboBox1, "comboBox1"); + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Name = "comboBox1"; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + this.comboBox1.TextChanged += new System.EventHandler(this.comboBox1_TextChanged); + this.comboBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox1_KeyPress); + // + // checkBox1 + // + resources.ApplyResources(this.checkBox1, "checkBox1"); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.UseVisualStyleBackColor = true; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.Name = "label1"; + // + // clearButton + // + resources.ApplyResources(this.clearButton, "clearButton"); + this.clearButton.ForeColor = System.Drawing.Color.Black; + this.clearButton.Name = "clearButton"; + this.clearButton.UseVisualStyleBackColor = true; + this.clearButton.Click += new System.EventHandler(this.clearButton_Click); + // + // comboBox2 + // + resources.ApplyResources(this.comboBox2, "comboBox2"); + this.comboBox2.FormattingEnabled = true; + this.comboBox2.Name = "comboBox2"; + this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); + this.comboBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox2_KeyPress); + // + // checkBox2 + // + resources.ApplyResources(this.checkBox2, "checkBox2"); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.UseVisualStyleBackColor = true; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.Name = "label2"; + // + // comboBox3 + // + resources.ApplyResources(this.comboBox3, "comboBox3"); + this.comboBox3.FormattingEnabled = true; + this.comboBox3.Name = "comboBox3"; + this.comboBox3.TextChanged += new System.EventHandler(this.comboBox3_TextChanged); + this.comboBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox3_KeyPress); + // + // checkBox3 + // + resources.ApplyResources(this.checkBox3, "checkBox3"); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.UseVisualStyleBackColor = true; + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.Name = "label3"; + // + // comboBox4 + // + resources.ApplyResources(this.comboBox4, "comboBox4"); + this.comboBox4.FormattingEnabled = true; + this.comboBox4.Name = "comboBox4"; + this.comboBox4.TextChanged += new System.EventHandler(this.comboBox4_TextChanged); + this.comboBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox4_KeyPress); + // + // checkBox4 + // + resources.ApplyResources(this.checkBox4, "checkBox4"); + this.checkBox4.Name = "checkBox4"; + this.checkBox4.UseVisualStyleBackColor = true; + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // comboBox5 + // + resources.ApplyResources(this.comboBox5, "comboBox5"); + this.comboBox5.FormattingEnabled = true; + this.comboBox5.Name = "comboBox5"; + this.comboBox5.TextChanged += new System.EventHandler(this.comboBox5_TextChanged); + this.comboBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox5_KeyPress); + // + // checkBox5 + // + resources.ApplyResources(this.checkBox5, "checkBox5"); + this.checkBox5.Name = "checkBox5"; + this.checkBox5.UseVisualStyleBackColor = true; + // + // label5 + // + resources.ApplyResources(this.label5, "label5"); + this.label5.Name = "label5"; + // + // comboBox6 + // + resources.ApplyResources(this.comboBox6, "comboBox6"); + this.comboBox6.FormattingEnabled = true; + this.comboBox6.Name = "comboBox6"; + this.comboBox6.TextChanged += new System.EventHandler(this.comboBox6_TextChanged); + this.comboBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox6_KeyPress); + // + // checkBox6 + // + resources.ApplyResources(this.checkBox6, "checkBox6"); + this.checkBox6.Name = "checkBox6"; + this.checkBox6.UseVisualStyleBackColor = true; + // + // label6 + // + resources.ApplyResources(this.label6, "label6"); + this.label6.Name = "label6"; + // + // remarkTextBox6 + // + resources.ApplyResources(this.remarkTextBox6, "remarkTextBox6"); + this.remarkTextBox6.Name = "remarkTextBox6"; + // + // remarkTextBox5 + // + resources.ApplyResources(this.remarkTextBox5, "remarkTextBox5"); + this.remarkTextBox5.Name = "remarkTextBox5"; + // + // remarkTextBox4 + // + resources.ApplyResources(this.remarkTextBox4, "remarkTextBox4"); + this.remarkTextBox4.Name = "remarkTextBox4"; + // + // remarkTextBox3 + // + resources.ApplyResources(this.remarkTextBox3, "remarkTextBox3"); + this.remarkTextBox3.Name = "remarkTextBox3"; + // + // remarkTextBox2 + // + resources.ApplyResources(this.remarkTextBox2, "remarkTextBox2"); + this.remarkTextBox2.Name = "remarkTextBox2"; + // + // remarkTextBox1 + // + resources.ApplyResources(this.remarkTextBox1, "remarkTextBox1"); + this.remarkTextBox1.Name = "remarkTextBox1"; + // + // orderComboBox + // + resources.ApplyResources(this.orderComboBox, "orderComboBox"); + this.orderComboBox.FormattingEnabled = true; + this.orderComboBox.Name = "orderComboBox"; + // + // orderLabel + // + resources.ApplyResources(this.orderLabel, "orderLabel"); + this.orderLabel.Name = "orderLabel"; + // + // snLabel + // + resources.ApplyResources(this.snLabel, "snLabel"); + this.snLabel.Name = "snLabel"; + // + // remarkLabel + // + resources.ApplyResources(this.remarkLabel, "remarkLabel"); + this.remarkLabel.Name = "remarkLabel"; + // + // CycleBeginningForm + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.DarkGoldenrod; + this.Controls.Add(this.remarkLabel); + this.Controls.Add(this.snLabel); + this.Controls.Add(this.orderLabel); + this.Controls.Add(this.orderComboBox); + this.Controls.Add(this.remarkTextBox6); + this.Controls.Add(this.remarkTextBox5); + this.Controls.Add(this.remarkTextBox4); + this.Controls.Add(this.remarkTextBox3); + this.Controls.Add(this.remarkTextBox2); + this.Controls.Add(this.remarkTextBox1); + this.Controls.Add(this.comboBox6); + this.Controls.Add(this.checkBox6); + this.Controls.Add(this.label6); + this.Controls.Add(this.comboBox5); + this.Controls.Add(this.checkBox5); + this.Controls.Add(this.label5); + this.Controls.Add(this.comboBox4); + this.Controls.Add(this.checkBox4); + this.Controls.Add(this.label4); + this.Controls.Add(this.comboBox3); + this.Controls.Add(this.checkBox3); + this.Controls.Add(this.label3); + this.Controls.Add(this.comboBox2); + this.Controls.Add(this.checkBox2); + this.Controls.Add(this.label2); + this.Controls.Add(this.comboBox1); + this.Controls.Add(this.clearButton); + this.Controls.Add(this.checkBox1); + this.Controls.Add(this.label1); + this.Controls.Add(this.okButton); + this.ForeColor = System.Drawing.Color.Black; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "CycleBeginningForm"; + this.TopMost = true; + this.Load += new System.EventHandler(this.CycleBeginningForm_Load); + this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.Button okButton; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.CheckBox checkBox2; - private System.Windows.Forms.CheckBox checkBox7; - private System.Windows.Forms.CheckBox checkBox3; - private System.Windows.Forms.CheckBox checkBox4; - private System.Windows.Forms.CheckBox checkBox5; - private System.Windows.Forms.CheckBox checkBox6; - private System.Windows.Forms.GroupBox orderGroupBox; - private System.Windows.Forms.ComboBox orderComboBox; - private System.Windows.Forms.ComboBox comboBox1; - private System.Windows.Forms.ComboBox comboBox2; - private System.Windows.Forms.ComboBox comboBox3; - private System.Windows.Forms.ComboBox comboBox4; - private System.Windows.Forms.ComboBox comboBox5; - private System.Windows.Forms.ComboBox comboBox6; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.Button clearButton; + private System.Windows.Forms.ComboBox comboBox2; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.ComboBox comboBox3; + private System.Windows.Forms.CheckBox checkBox3; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ComboBox comboBox4; + private System.Windows.Forms.CheckBox checkBox4; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox comboBox5; + private System.Windows.Forms.CheckBox checkBox5; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox comboBox6; + private System.Windows.Forms.CheckBox checkBox6; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox remarkTextBox6; + private System.Windows.Forms.TextBox remarkTextBox5; + private System.Windows.Forms.TextBox remarkTextBox4; + private System.Windows.Forms.TextBox remarkTextBox3; + private System.Windows.Forms.TextBox remarkTextBox2; + private System.Windows.Forms.TextBox remarkTextBox1; + private System.Windows.Forms.ComboBox orderComboBox; + private System.Windows.Forms.Label orderLabel; + private System.Windows.Forms.Label snLabel; + private System.Windows.Forms.Label remarkLabel; } } \ No newline at end of file diff --git a/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs index 8060bb5d3..389640adc 100644 --- a/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs @@ -15,11 +15,13 @@ namespace TBF.BenchControl.DataEntry.Standard6 /// Number of text boxes for serial numbers public readonly int WaterMetersCount; + public readonly bool RemarksEnabled; /// To be retrieved after the form is closed public string PurchaseOrder; public string[] SNText; public bool[] Disabled; + public string[] Remark; /// Set to 'true' when the form closes public bool Completed { get { return completed; } } @@ -27,21 +29,30 @@ namespace TBF.BenchControl.DataEntry.Standard6 IList enabledComboBoxes; + ComboBox[] comboBoxes; + CheckBox[] checkBoxes; + TextBox[] remarkBoxes; + /// /// Constructor /// /// Number of text boxes for serial numbers - public CycleBeginningForm(int waterMetersCount) + public CycleBeginningForm(int waterMetersCount, bool remarksEnabled) { InitializeComponent(); ControlBox = false; + comboBoxes = new ComboBox[] { comboBox1, comboBox2, comboBox3, comboBox4, comboBox5, comboBox6 }; + checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6 }; + remarkBoxes = new TextBox[] { remarkTextBox1, remarkTextBox2, remarkTextBox3, + remarkTextBox4, remarkTextBox5, remarkTextBox6 }; + this.WaterMetersCount = waterMetersCount; + this.RemarksEnabled = remarksEnabled; SNText = new string[WaterMetersCount]; Disabled = new bool[WaterMetersCount]; - enabledComboBoxes = new List(); - - Height = 147 + WaterMetersCount * 90; + Remark = new string[WaterMetersCount]; + enabledComboBoxes = new List(); completed = false; StartForceCloseHandler(); @@ -49,7 +60,7 @@ namespace TBF.BenchControl.DataEntry.Standard6 /// Parameterless constructor for all watermeters public CycleBeginningForm() - : this(Config.Data.WMsCount) + : this(Config.Data.WMsCount, false) { } @@ -69,37 +80,43 @@ namespace TBF.BenchControl.DataEntry.Standard6 if (WaterMetersCount >= 6) comboBox6.Items.Add((Program.LocalSettings.LastSNTexts[5] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[5]); } - if (WaterMetersCount < 1) { groupBox1.Visible = false; } else { enabledComboBoxes.Add(comboBox1); } - if (WaterMetersCount < 2) { groupBox2.Visible = false; } else { enabledComboBoxes.Add(comboBox2); } - if (WaterMetersCount < 3) { groupBox3.Visible = false; } else { enabledComboBoxes.Add(comboBox3); } - if (WaterMetersCount < 4) { groupBox4.Visible = false; } else { enabledComboBoxes.Add(comboBox4); } - if (WaterMetersCount < 5) { groupBox5.Visible = false; } else { enabledComboBoxes.Add(comboBox5); } - if (WaterMetersCount < 6) { groupBox6.Visible = false; } else { enabledComboBoxes.Add(comboBox6); } + if (WaterMetersCount >= 1) { enabledComboBoxes.Add(comboBox1); } else { comboBox1.Visible = false; label1.Visible = false; checkBox1.Visible = false; } + if (WaterMetersCount >= 2) { enabledComboBoxes.Add(comboBox2); } else { comboBox2.Visible = false; label2.Visible = false; checkBox2.Visible = false; } + if (WaterMetersCount >= 3) { enabledComboBoxes.Add(comboBox3); } else { comboBox3.Visible = false; label3.Visible = false; checkBox3.Visible = false; } + if (WaterMetersCount >= 4) { enabledComboBoxes.Add(comboBox4); } else { comboBox4.Visible = false; label4.Visible = false; checkBox4.Visible = false; } + if (WaterMetersCount >= 5) { enabledComboBoxes.Add(comboBox5); } else { comboBox5.Visible = false; label5.Visible = false; checkBox5.Visible = false; } + if (WaterMetersCount >= 6) { enabledComboBoxes.Add(comboBox6); } else { comboBox6.Visible = false; label6.Visible = false; checkBox6.Visible = false; } - Height = 147 + WaterMetersCount * 90; - } + if (RemarksEnabled) + { + if (WaterMetersCount >= 1) { remarkTextBox1.Visible = true; remarkLabel.Visible = true; } + if (WaterMetersCount >= 2) { remarkTextBox2.Visible = true; } + if (WaterMetersCount >= 3) { remarkTextBox3.Visible = true; } + if (WaterMetersCount >= 4) { remarkTextBox4.Visible = true; } + if (WaterMetersCount >= 5) { remarkTextBox5.Visible = true; } + if (WaterMetersCount >= 6) { remarkTextBox6.Visible = true; } + } + + Height = 177 + WaterMetersCount * 46; + if (!RemarksEnabled) Width -= remarkTextBox1.Width; + //Size = new System.Drawing.Size(RemarksEnabled ? 1045 : 624, 177 + WaterMetersCount * 46); + } void Localize() { Text = Strings.Data; - orderGroupBox.Text = Strings.Purchase_order; + orderLabel.Text = Strings.Purchase_order; + snLabel.Text = Strings.Serial_Number; + remarkLabel.Text = Strings.Remark; + okButton.Text = Strings.OkBtnText; + clearButton.Text = Strings.ClearBtnText; - groupBox1.Text = Strings.Water_Meter + " 1"; - groupBox2.Text = Strings.Water_Meter + " 2"; - groupBox3.Text = Strings.Water_Meter + " 3"; - groupBox4.Text = Strings.Water_Meter + " 4"; - groupBox5.Text = Strings.Water_Meter + " 5"; - groupBox6.Text = Strings.Water_Meter + " 6"; - - label1.Text = Strings.Serial_Number; - label2.Text = Strings.Serial_Number; - label3.Text = Strings.Serial_Number; - label4.Text = Strings.Serial_Number; - label5.Text = Strings.Serial_Number; - label6.Text = Strings.Serial_Number; - - okButton.Text = Strings.OkBtnText; - clearButton.Text = Strings.ClearBtnText; + label1.Text = Strings.Water_Meter + " 1"; + label2.Text = Strings.Water_Meter + " 2"; + label3.Text = Strings.Water_Meter + " 3"; + label4.Text = Strings.Water_Meter + " 4"; + label5.Text = Strings.Water_Meter + " 5"; + label6.Text = Strings.Water_Meter + " 6"; } /// @@ -129,14 +146,14 @@ namespace TBF.BenchControl.DataEntry.Standard6 #endif ); - Program.LocalSettings.LastSNTexts = SNText; + Program.LocalSettings.LastSNTexts = SNText; - if (WaterMetersCount >= 1) { SNText[0] = comboBox1.Text; Disabled[0] = !checkBox1.Checked; } - if (WaterMetersCount >= 2) { SNText[1] = comboBox2.Text; Disabled[1] = !checkBox2.Checked; } - if (WaterMetersCount >= 3) { SNText[2] = comboBox3.Text; Disabled[2] = !checkBox3.Checked; } - if (WaterMetersCount >= 4) { SNText[3] = comboBox4.Text; Disabled[3] = !checkBox4.Checked; } - if (WaterMetersCount >= 5) { SNText[4] = comboBox5.Text; Disabled[4] = !checkBox5.Checked; } - if (WaterMetersCount >= 6) { SNText[5] = comboBox6.Text; Disabled[5] = !checkBox6.Checked; } + for (int i = 0; i < WaterMetersCount; i++) + { + SNText[i] = comboBoxes[i].Text; + Disabled[i] = !checkBoxes[i].Checked; + Remark[i] = remarkBoxes[i].Text; + } completed = true; Close(); @@ -145,36 +162,11 @@ namespace TBF.BenchControl.DataEntry.Standard6 private void UpdateAllCombos() { - if (WaterMetersCount >= 1) - { - comboBox1.Text = Program.LocalSettings.LastSNTexts[0]; - checkBox1.Checked = !string.IsNullOrEmpty(comboBox1.Text); - } - if (WaterMetersCount >= 2) - { - comboBox2.Text = Program.LocalSettings.LastSNTexts[1]; - checkBox2.Checked = !string.IsNullOrEmpty(comboBox2.Text); - } - if (WaterMetersCount >= 3) - { - comboBox3.Text = Program.LocalSettings.LastSNTexts[2]; - checkBox3.Checked = !string.IsNullOrEmpty(comboBox3.Text); - } - if (WaterMetersCount >= 4) - { - comboBox4.Text = Program.LocalSettings.LastSNTexts[3]; - checkBox4.Checked = !string.IsNullOrEmpty(comboBox4.Text); - } - if (WaterMetersCount >= 5) - { - comboBox5.Text = Program.LocalSettings.LastSNTexts[4]; - checkBox5.Checked = !string.IsNullOrEmpty(comboBox5.Text); - } - if (WaterMetersCount >= 6) - { - comboBox6.Text = Program.LocalSettings.LastSNTexts[5]; - checkBox6.Checked = !string.IsNullOrEmpty(comboBox6.Text); - } + for (int i = 0; i < WaterMetersCount; i++) + { + comboBoxes[i].Text = Program.LocalSettings.LastSNTexts[i]; + checkBoxes[i].Checked = !string.IsNullOrEmpty(comboBoxes[i].Text); + } } private void comboBox1_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; } @@ -236,12 +228,11 @@ namespace TBF.BenchControl.DataEntry.Standard6 private void clearButton_Click(object sender, EventArgs e) { - if (WaterMetersCount >= 1) { comboBox1.Text = string.Empty; checkBox1.Checked = false; } - if (WaterMetersCount >= 2) { comboBox2.Text = string.Empty; checkBox2.Checked = false; } - if (WaterMetersCount >= 3) { comboBox3.Text = string.Empty; checkBox3.Checked = false; } - if (WaterMetersCount >= 4) { comboBox4.Text = string.Empty; checkBox4.Checked = false; } - if (WaterMetersCount >= 5) { comboBox5.Text = string.Empty; checkBox5.Checked = false; } - if (WaterMetersCount >= 6) { comboBox6.Text = string.Empty; checkBox6.Checked = false; } + for (int i = 0; i < WaterMetersCount; i++) + { + comboBoxes[i].Text = string.Empty; + checkBoxes[i].Checked = false; + } } diff --git a/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx index 5eb91cb2d..4c5c3aeb5 100644 --- a/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx +++ b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx @@ -117,12 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Top, Right + Verdana, 14.25pt - 506, 26 + 909, 26 98, 63 @@ -144,73 +148,13 @@ $this - 8 + 29 - - comboBox1 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - checkBox1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 2 - - + Verdana, 14.25pt - - 28, 110 - - - 444, 77 - - - 1 - - - Watermeter 1 - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 7 - - 187, 29 + 196, 143 163, 31 @@ -225,10 +169,10 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - groupBox1 + $this - 0 + 25 True @@ -237,7 +181,7 @@ Verdana, 27.75pt - 391, 40 + 400, 154 15, 14 @@ -252,25 +196,28 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - groupBox1 + $this - 1 + 27 True + + Verdana, 14.25pt + - 18, 32 + 27, 146 - 156, 23 + 147, 23 0 - Serial Number: + Water meter 1 label1 @@ -279,785 +226,13 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - groupBox1 + $this - 2 + 28 - - comboBox2 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - checkBox2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 2 - - - Verdana, 14.25pt - - - 28, 200 - - - 444, 77 - - - 2 - - - Watermeter 2 - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 6 - - - 187, 29 - - - 163, 31 - - - 8 - - - comboBox2 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - True - - - Verdana, 27.75pt - - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 - - - True - - - 18, 32 - - - 156, 23 - - - 0 - - - Serial Number: - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 2 - - - comboBox3 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 0 - - - checkBox7 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 1 - - - checkBox3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 2 - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 3 - - - Verdana, 14.25pt - - - 28, 290 - - - 444, 77 - - - 3 - - - Watermeter 3 - - - groupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - - - 187, 31 - - - 163, 31 - - - 8 - - - comboBox3 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, -161 - - - 15, 14 - - - 2 - - - checkBox7 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 1 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 2 - - - True - - - NoControl - - - 18, 32 - - - 156, 23 - - - 0 - - - Serial Number: - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 3 - - - comboBox4 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 0 - - - checkBox4 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 1 - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 2 - - - Verdana, 14.25pt - - - 28, 380 - - - 444, 77 - - - 4 - - - Watermeter 4 - - - groupBox4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - 187, 29 - - - 163, 31 - - - 8 - - - comboBox4 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox4 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 1 - - - True - - - 18, 32 - - - 156, 23 - - - 0 - - - Serial Number: - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 2 - - - comboBox5 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 0 - - - checkBox5 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 1 - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 2 - - - Verdana, 14.25pt - - - 28, 470 - - - 444, 77 - - - 5 - - - Watermeter 5 - - - groupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - 187, 29 - - - 163, 31 - - - 8 - - - comboBox5 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox5 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 1 - - - True - - - 18, 32 - - - 156, 23 - - - 0 - - - Serial Number: - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 2 - - - 187, 29 - - - 163, 31 - - - 8 - - - comboBox6 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox6 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 1 - - - True - - - 18, 32 - - - 156, 23 - - - 0 - - - Serial Number: - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 2 - - - Verdana, 14.25pt - - - 28, 560 - - - 444, 77 - - - 6 - - - Watermeter 6 - - - groupBox6 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - orderComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - orderGroupBox - - - 0 - - - Verdana, 14.25pt - - - 28, 12 - - - 444, 82 - - - 0 - - - Order - - - orderGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - 90, 31 - - - 260, 31 - - - 0 - - - orderComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - orderGroupBox - - - 0 + + Top, Right Verdana, 14.25pt @@ -1066,7 +241,7 @@ NoControl - 506, 107 + 909, 107 98, 63 @@ -1087,6 +262,747 @@ $this + 26 + + + Verdana, 14.25pt + + + 196, 189 + + + 163, 31 + + + 11 + + + comboBox2 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 22 + + + True + + + Verdana, 27.75pt + + + NoControl + + + 400, 199 + + + 15, 14 + + + 10 + + + checkBox2 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 23 + + + True + + + Verdana, 14.25pt + + + NoControl + + + 27, 192 + + + 147, 23 + + + 9 + + + Water meter 2 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 24 + + + Verdana, 14.25pt + + + 196, 235 + + + 163, 31 + + + 14 + + + comboBox3 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + True + + + Verdana, 27.75pt + + + NoControl + + + 400, 244 + + + 15, 14 + + + 13 + + + checkBox3 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + True + + + Verdana, 14.25pt + + + NoControl + + + 27, 238 + + + 147, 23 + + + 12 + + + Water meter 3 + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + + Verdana, 14.25pt + + + 196, 281 + + + 163, 31 + + + 17 + + + comboBox4 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + True + + + Verdana, 27.75pt + + + NoControl + + + 400, 289 + + + 15, 14 + + + 16 + + + checkBox4 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + True + + + Verdana, 14.25pt + + + NoControl + + + 27, 284 + + + 147, 23 + + + 15 + + + Water meter 4 + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 18 + + + Verdana, 14.25pt + + + 196, 327 + + + 163, 31 + + + 20 + + + comboBox5 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + + + True + + + Verdana, 27.75pt + + + NoControl + + + 400, 334 + + + 15, 14 + + + 19 + + + checkBox5 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + True + + + Verdana, 14.25pt + + + NoControl + + + 27, 330 + + + 147, 23 + + + 18 + + + Water meter 5 + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + Verdana, 14.25pt + + + 196, 373 + + + 163, 31 + + + 23 + + + comboBox6 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + True + + + Verdana, 27.75pt + + + NoControl + + + 400, 379 + + + 15, 14 + + + 22 + + + checkBox6 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + True + + + Verdana, 14.25pt + + + NoControl + + + 27, 376 + + + 147, 23 + + + 21 + + + Water meter 6 + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + Verdana, 14.25pt + + + 453, 373 + + + 6, 5, 6, 5 + + + 421, 31 + + + 29 + + + False + + + remarkTextBox6 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + Verdana, 14.25pt + + + 453, 327 + + + 6, 5, 6, 5 + + + 421, 31 + + + 28 + + + False + + + remarkTextBox5 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Verdana, 14.25pt + + + 453, 281 + + + 6, 5, 6, 5 + + + 421, 31 + + + 27 + + + False + + + remarkTextBox4 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Verdana, 14.25pt + + + 453, 235 + + + 6, 5, 6, 5 + + + 421, 31 + + + 26 + + + False + + + remarkTextBox3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Verdana, 14.25pt + + + 453, 189 + + + 6, 5, 6, 5 + + + 421, 31 + + + 25 + + + False + + + remarkTextBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + Verdana, 14.25pt + + + 453, 143 + + + 6, 5, 6, 5 + + + 421, 31 + + + 24 + + + False + + + remarkTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + Verdana, 14.25pt + + + 196, 43 + + + 260, 31 + + + 0 + + + orderComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + + Verdana, 14.25pt + + + NoControl + + + 27, 46 + + + 73, 23 + + + 30 + + + Order: + + + orderLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + Verdana, 14.25pt + + + NoControl + + + 192, 107 + + + 145, 23 + + + 31 + + + Serial number + + + snLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + Verdana, 14.25pt + + + NoControl + + + 449, 107 + + + 82, 23 + + + 32 + + + Remark + + + False + + + remarkLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 @@ -1099,7 +1015,7 @@ True - 636, 656 + 1039, 429 Batch data diff --git a/TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs index 880c6070b..156ed4669 100644 --- a/TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs +++ b/TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs @@ -123,13 +123,13 @@ namespace TBF.BenchControl.DataEntry.Standard6 /// void OpenBeginningDlg(EntryFormNoStartEnd myRef) { - myRef.modelessDlg = new CycleBeginningForm(myRef.waterMeters.Length); + myRef.modelessDlg = new CycleBeginningForm(myRef.waterMeters.Length, (myRef.entryFormCfg.RemarkEnabled && !myRef.entryFormCfg.ShowCycleEndForm)); modelessDlg.Show(); } /// void OpenEndDlg(EntryFormNoStartEnd myRef) { - myRef.modelessDlg = new CycleEndForm(myRef.waterMeters.Length, entryFormCfg.RemarkEnabled); + myRef.modelessDlg = new CycleEndForm(myRef.waterMeters.Length, myRef.entryFormCfg.RemarkEnabled); modelessDlg.Show(); } /// @@ -201,6 +201,10 @@ namespace TBF.BenchControl.DataEntry.Standard6 { waterMeters[i].SerialNr = dlg.SNText[i]; disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i]; + if (dlg.RemarksEnabled) + { + waterMeters[i].Remark = dlg.Remark[i]; + } } } } diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 2f5840518..5b1ee0055 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1075.0")] -[assembly: AssemblyFileVersion("2.18.1075.0")] +[assembly: AssemblyVersion("2.18.1076.0")] +[assembly: AssemblyFileVersion("2.18.1076.0")]