From b7bc5659e6ddf29dd6c3842e2103ddc127aa07ec Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 28 Apr 2015 19:18:43 +0200 Subject: [PATCH] Order added to DataEntry.Combined. TODO: Process checkboxes. s/n history. --- .../Combined/CycleBeginningForm.Designer.cs | 480 +++++++++++------- .../DataEntry/Combined/CycleBeginningForm.cs | 73 ++- .../Combined/CycleBeginningForm.resx | 48 -- .../DataEntry/Standard/CycleBeginningForm.cs | 6 +- 4 files changed, 348 insertions(+), 259 deletions(-) diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs index f7c5fa038..599cbe426 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs @@ -31,203 +31,283 @@ namespace TBF.BenchControl.DataEntry.Combined /// private void InitializeComponent() { - this.okButton = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.auxSN1TextBox = new System.Windows.Forms.TextBox(); - this.auxSN1Label = new System.Windows.Forms.Label(); - this.mainSN1TextBox = new System.Windows.Forms.TextBox(); - this.mainSN1Label = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.auxSN2TextBox = new System.Windows.Forms.TextBox(); - this.auxSN2Label = new System.Windows.Forms.Label(); - this.mainSN2TextBox = new System.Windows.Forms.TextBox(); - this.mainSN2Label = new System.Windows.Forms.Label(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.auxSN3TextBox = new System.Windows.Forms.TextBox(); - this.auxSN3Label = new System.Windows.Forms.Label(); - this.mainSN3TextBox = new System.Windows.Forms.TextBox(); - this.mainSN3Label = new System.Windows.Forms.Label(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.SuspendLayout(); - // - // okButton - // - this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Location = new System.Drawing.Point(527, 43); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(98, 63); - this.okButton.TabIndex = 0; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.auxSN1TextBox); - this.groupBox1.Controls.Add(this.auxSN1Label); - this.groupBox1.Controls.Add(this.mainSN1TextBox); - this.groupBox1.Controls.Add(this.mainSN1Label); - this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox1.ForeColor = System.Drawing.Color.Black; - this.groupBox1.Location = new System.Drawing.Point(28, 18); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(464, 137); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Water Meter 1"; - // - // auxSN1TextBox - // - this.auxSN1TextBox.Location = new System.Drawing.Point(262, 83); - this.auxSN1TextBox.Name = "auxSN1TextBox"; - this.auxSN1TextBox.Size = new System.Drawing.Size(163, 31); - this.auxSN1TextBox.TabIndex = 3; - // - // auxSN1Label - // - this.auxSN1Label.AutoSize = true; - this.auxSN1Label.Location = new System.Drawing.Point(21, 86); - this.auxSN1Label.Name = "auxSN1Label"; - this.auxSN1Label.Size = new System.Drawing.Size(193, 23); - this.auxSN1Label.TabIndex = 2; - this.auxSN1Label.Text = "Aux. WM Serial Nr."; - // - // mainSN1TextBox - // - this.mainSN1TextBox.Location = new System.Drawing.Point(262, 37); - this.mainSN1TextBox.Name = "mainSN1TextBox"; - this.mainSN1TextBox.Size = new System.Drawing.Size(163, 31); - this.mainSN1TextBox.TabIndex = 1; - // - // mainSN1Label - // - this.mainSN1Label.AutoSize = true; - this.mainSN1Label.Location = new System.Drawing.Point(21, 40); - this.mainSN1Label.Name = "mainSN1Label"; - this.mainSN1Label.Size = new System.Drawing.Size(195, 23); - this.mainSN1Label.TabIndex = 0; - this.mainSN1Label.Text = "Main WM Serial Nr."; - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.auxSN2TextBox); - this.groupBox2.Controls.Add(this.auxSN2Label); - this.groupBox2.Controls.Add(this.mainSN2TextBox); - this.groupBox2.Controls.Add(this.mainSN2Label); - this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Location = new System.Drawing.Point(28, 175); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(464, 137); - this.groupBox2.TabIndex = 2; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Water Meter 2"; - // - // auxSN2TextBox - // - this.auxSN2TextBox.Location = new System.Drawing.Point(262, 83); - this.auxSN2TextBox.Name = "auxSN2TextBox"; - this.auxSN2TextBox.Size = new System.Drawing.Size(163, 31); - this.auxSN2TextBox.TabIndex = 3; - // - // auxSN2Label - // - this.auxSN2Label.AutoSize = true; - this.auxSN2Label.Location = new System.Drawing.Point(21, 86); - this.auxSN2Label.Name = "auxSN2Label"; - this.auxSN2Label.Size = new System.Drawing.Size(193, 23); - this.auxSN2Label.TabIndex = 2; - this.auxSN2Label.Text = "Aux. WM Serial Nr."; - // - // mainSN2TextBox - // - this.mainSN2TextBox.Location = new System.Drawing.Point(262, 37); - this.mainSN2TextBox.Name = "mainSN2TextBox"; - this.mainSN2TextBox.Size = new System.Drawing.Size(163, 31); - this.mainSN2TextBox.TabIndex = 1; - // - // mainSN2Label - // - this.mainSN2Label.AutoSize = true; - this.mainSN2Label.Location = new System.Drawing.Point(21, 40); - this.mainSN2Label.Name = "mainSN2Label"; - this.mainSN2Label.Size = new System.Drawing.Size(195, 23); - this.mainSN2Label.TabIndex = 0; - this.mainSN2Label.Text = "Main WM Serial Nr."; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.auxSN3TextBox); - this.groupBox3.Controls.Add(this.auxSN3Label); - this.groupBox3.Controls.Add(this.mainSN3TextBox); - this.groupBox3.Controls.Add(this.mainSN3Label); - this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox3.ForeColor = System.Drawing.Color.Black; - this.groupBox3.Location = new System.Drawing.Point(28, 330); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(464, 137); - this.groupBox3.TabIndex = 3; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Water Meter 3"; - // - // auxSN3TextBox - // - this.auxSN3TextBox.Location = new System.Drawing.Point(262, 83); - this.auxSN3TextBox.Name = "auxSN3TextBox"; - this.auxSN3TextBox.Size = new System.Drawing.Size(163, 31); - this.auxSN3TextBox.TabIndex = 3; - // - // auxSN3Label - // - this.auxSN3Label.AutoSize = true; - this.auxSN3Label.Location = new System.Drawing.Point(21, 86); - this.auxSN3Label.Name = "auxSN3Label"; - this.auxSN3Label.Size = new System.Drawing.Size(193, 23); - this.auxSN3Label.TabIndex = 2; - this.auxSN3Label.Text = "Aux. WM Serial Nr."; - // - // mainSN3TextBox - // - this.mainSN3TextBox.Location = new System.Drawing.Point(262, 37); - this.mainSN3TextBox.Name = "mainSN3TextBox"; - this.mainSN3TextBox.Size = new System.Drawing.Size(163, 31); - this.mainSN3TextBox.TabIndex = 1; - // - // mainSN3Label - // - this.mainSN3Label.AutoSize = true; - this.mainSN3Label.Location = new System.Drawing.Point(21, 40); - this.mainSN3Label.Name = "mainSN3Label"; - this.mainSN3Label.Size = new System.Drawing.Size(195, 23); - this.mainSN3Label.TabIndex = 0; - this.mainSN3Label.Text = "Main WM Serial Nr."; - // - // CycleBeginningForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; - this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(653, 492); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.okButton); - this.ForeColor = System.Drawing.Color.Black; - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "CycleBeginningForm"; - this.Text = "Daten"; - this.TopMost = true; - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.ResumeLayout(false); + this.okButton = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.auxSN1TextBox = new System.Windows.Forms.TextBox(); + this.auxSN1Label = new System.Windows.Forms.Label(); + this.mainSN1TextBox = new System.Windows.Forms.TextBox(); + this.mainSN1Label = new System.Windows.Forms.Label(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.auxSN2TextBox = new System.Windows.Forms.TextBox(); + this.auxSN2Label = new System.Windows.Forms.Label(); + this.mainSN2TextBox = new System.Windows.Forms.TextBox(); + this.mainSN2Label = new System.Windows.Forms.Label(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.auxSN3TextBox = new System.Windows.Forms.TextBox(); + this.auxSN3Label = new System.Windows.Forms.Label(); + this.mainSN3TextBox = new System.Windows.Forms.TextBox(); + this.mainSN3Label = new System.Windows.Forms.Label(); + this.clearButton = new System.Windows.Forms.Button(); + this.orderGroupBox = new System.Windows.Forms.GroupBox(); + this.orderComboBox = new System.Windows.Forms.ComboBox(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.orderGroupBox.SuspendLayout(); + this.SuspendLayout(); + // + // okButton + // + this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.okButton.ForeColor = System.Drawing.Color.Black; + this.okButton.Location = new System.Drawing.Point(599, 33); + this.okButton.Name = "okButton"; + this.okButton.Size = new System.Drawing.Size(98, 63); + this.okButton.TabIndex = 0; + this.okButton.Text = "OK"; + this.okButton.UseVisualStyleBackColor = true; + this.okButton.Click += new System.EventHandler(this.okButton_Click); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.checkBox1); + this.groupBox1.Controls.Add(this.auxSN1TextBox); + this.groupBox1.Controls.Add(this.auxSN1Label); + this.groupBox1.Controls.Add(this.mainSN1TextBox); + this.groupBox1.Controls.Add(this.mainSN1Label); + this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.groupBox1.ForeColor = System.Drawing.Color.Black; + this.groupBox1.Location = new System.Drawing.Point(28, 118); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(533, 137); + this.groupBox1.TabIndex = 1; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Water Meter 1"; + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Font = new System.Drawing.Font("Verdana", 27.75F); + this.checkBox1.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.checkBox1.Location = new System.Drawing.Point(472, 69); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(15, 14); + this.checkBox1.TabIndex = 4; + this.checkBox1.UseVisualStyleBackColor = true; + // + // auxSN1TextBox + // + this.auxSN1TextBox.Location = new System.Drawing.Point(262, 83); + this.auxSN1TextBox.Name = "auxSN1TextBox"; + this.auxSN1TextBox.Size = new System.Drawing.Size(163, 31); + this.auxSN1TextBox.TabIndex = 3; + // + // auxSN1Label + // + this.auxSN1Label.AutoSize = true; + this.auxSN1Label.Location = new System.Drawing.Point(21, 86); + this.auxSN1Label.Name = "auxSN1Label"; + this.auxSN1Label.Size = new System.Drawing.Size(193, 23); + this.auxSN1Label.TabIndex = 2; + this.auxSN1Label.Text = "Aux. WM Serial Nr."; + // + // mainSN1TextBox + // + this.mainSN1TextBox.Location = new System.Drawing.Point(262, 37); + this.mainSN1TextBox.Name = "mainSN1TextBox"; + this.mainSN1TextBox.Size = new System.Drawing.Size(163, 31); + this.mainSN1TextBox.TabIndex = 1; + // + // mainSN1Label + // + this.mainSN1Label.AutoSize = true; + this.mainSN1Label.Location = new System.Drawing.Point(21, 40); + this.mainSN1Label.Name = "mainSN1Label"; + this.mainSN1Label.Size = new System.Drawing.Size(195, 23); + this.mainSN1Label.TabIndex = 0; + this.mainSN1Label.Text = "Main WM Serial Nr."; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.checkBox2); + this.groupBox2.Controls.Add(this.auxSN2TextBox); + this.groupBox2.Controls.Add(this.auxSN2Label); + this.groupBox2.Controls.Add(this.mainSN2TextBox); + this.groupBox2.Controls.Add(this.mainSN2Label); + this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.groupBox2.ForeColor = System.Drawing.Color.Black; + this.groupBox2.Location = new System.Drawing.Point(28, 275); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(533, 137); + this.groupBox2.TabIndex = 2; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Water Meter 2"; + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Font = new System.Drawing.Font("Verdana", 27.75F); + this.checkBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.checkBox2.Location = new System.Drawing.Point(472, 69); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(15, 14); + this.checkBox2.TabIndex = 8; + this.checkBox2.UseVisualStyleBackColor = true; + // + // auxSN2TextBox + // + this.auxSN2TextBox.Location = new System.Drawing.Point(262, 83); + this.auxSN2TextBox.Name = "auxSN2TextBox"; + this.auxSN2TextBox.Size = new System.Drawing.Size(163, 31); + this.auxSN2TextBox.TabIndex = 3; + // + // auxSN2Label + // + this.auxSN2Label.AutoSize = true; + this.auxSN2Label.Location = new System.Drawing.Point(21, 86); + this.auxSN2Label.Name = "auxSN2Label"; + this.auxSN2Label.Size = new System.Drawing.Size(193, 23); + this.auxSN2Label.TabIndex = 2; + this.auxSN2Label.Text = "Aux. WM Serial Nr."; + // + // mainSN2TextBox + // + this.mainSN2TextBox.Location = new System.Drawing.Point(262, 37); + this.mainSN2TextBox.Name = "mainSN2TextBox"; + this.mainSN2TextBox.Size = new System.Drawing.Size(163, 31); + this.mainSN2TextBox.TabIndex = 1; + // + // mainSN2Label + // + this.mainSN2Label.AutoSize = true; + this.mainSN2Label.Location = new System.Drawing.Point(21, 40); + this.mainSN2Label.Name = "mainSN2Label"; + this.mainSN2Label.Size = new System.Drawing.Size(195, 23); + this.mainSN2Label.TabIndex = 0; + this.mainSN2Label.Text = "Main WM Serial Nr."; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.checkBox3); + this.groupBox3.Controls.Add(this.auxSN3TextBox); + this.groupBox3.Controls.Add(this.auxSN3Label); + this.groupBox3.Controls.Add(this.mainSN3TextBox); + this.groupBox3.Controls.Add(this.mainSN3Label); + this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.groupBox3.ForeColor = System.Drawing.Color.Black; + this.groupBox3.Location = new System.Drawing.Point(28, 430); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(533, 137); + this.groupBox3.TabIndex = 3; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Water Meter 3"; + // + // checkBox3 + // + this.checkBox3.AutoSize = true; + this.checkBox3.Font = new System.Drawing.Font("Verdana", 27.75F); + this.checkBox3.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.checkBox3.Location = new System.Drawing.Point(472, 68); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(15, 14); + this.checkBox3.TabIndex = 8; + this.checkBox3.UseVisualStyleBackColor = true; + // + // auxSN3TextBox + // + this.auxSN3TextBox.Location = new System.Drawing.Point(262, 83); + this.auxSN3TextBox.Name = "auxSN3TextBox"; + this.auxSN3TextBox.Size = new System.Drawing.Size(163, 31); + this.auxSN3TextBox.TabIndex = 3; + // + // auxSN3Label + // + this.auxSN3Label.AutoSize = true; + this.auxSN3Label.Location = new System.Drawing.Point(21, 86); + this.auxSN3Label.Name = "auxSN3Label"; + this.auxSN3Label.Size = new System.Drawing.Size(193, 23); + this.auxSN3Label.TabIndex = 2; + this.auxSN3Label.Text = "Aux. WM Serial Nr."; + // + // mainSN3TextBox + // + this.mainSN3TextBox.Location = new System.Drawing.Point(262, 37); + this.mainSN3TextBox.Name = "mainSN3TextBox"; + this.mainSN3TextBox.Size = new System.Drawing.Size(163, 31); + this.mainSN3TextBox.TabIndex = 1; + // + // mainSN3Label + // + this.mainSN3Label.AutoSize = true; + this.mainSN3Label.Location = new System.Drawing.Point(21, 40); + this.mainSN3Label.Name = "mainSN3Label"; + this.mainSN3Label.Size = new System.Drawing.Size(195, 23); + this.mainSN3Label.TabIndex = 0; + this.mainSN3Label.Text = "Main WM Serial Nr."; + // + // clearButton + // + this.clearButton.Font = new System.Drawing.Font("Verdana", 14.25F); + this.clearButton.ForeColor = System.Drawing.Color.Black; + this.clearButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.clearButton.Location = new System.Drawing.Point(599, 116); + this.clearButton.Name = "clearButton"; + this.clearButton.Size = new System.Drawing.Size(98, 63); + this.clearButton.TabIndex = 9; + this.clearButton.Text = "Clear"; + this.clearButton.UseVisualStyleBackColor = true; + this.clearButton.Click += new System.EventHandler(this.clearButton_Click); + // + // orderGroupBox + // + this.orderGroupBox.Controls.Add(this.orderComboBox); + this.orderGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F); + this.orderGroupBox.ForeColor = System.Drawing.Color.Black; + this.orderGroupBox.Location = new System.Drawing.Point(28, 16); + this.orderGroupBox.Name = "orderGroupBox"; + this.orderGroupBox.Size = new System.Drawing.Size(533, 82); + this.orderGroupBox.TabIndex = 10; + this.orderGroupBox.TabStop = false; + this.orderGroupBox.Text = "Order"; + // + // orderComboBox + // + this.orderComboBox.FormattingEnabled = true; + this.orderComboBox.Location = new System.Drawing.Point(165, 30); + this.orderComboBox.Name = "orderComboBox"; + this.orderComboBox.Size = new System.Drawing.Size(260, 31); + this.orderComboBox.TabIndex = 0; + // + // CycleBeginningForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoSize = true; + this.BackColor = System.Drawing.Color.DarkGoldenrod; + this.ClientSize = new System.Drawing.Size(732, 593); + this.Controls.Add(this.orderGroupBox); + this.Controls.Add(this.clearButton); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.okButton); + this.ForeColor = System.Drawing.Color.Black; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "CycleBeginningForm"; + this.Text = "Daten"; + this.TopMost = true; + this.Load += new System.EventHandler(this.CycleBeginningForm_Load); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.orderGroupBox.ResumeLayout(false); + this.ResumeLayout(false); } @@ -249,5 +329,11 @@ namespace TBF.BenchControl.DataEntry.Combined private System.Windows.Forms.Label auxSN3Label; private System.Windows.Forms.TextBox mainSN3TextBox; private System.Windows.Forms.Label mainSN3Label; + private System.Windows.Forms.Button clearButton; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox3; + private System.Windows.Forms.GroupBox orderGroupBox; + private System.Windows.Forms.ComboBox orderComboBox; } } \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.cs index 4226164e6..31b27389d 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.cs @@ -15,14 +15,17 @@ namespace TBF.BenchControl.DataEntry.Combined private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm)); // To be retrieved after the form closes + public string PurchaseOrder; public string[] MainSNText; public string[] AuxSNText; - public bool[] WMExists; + public bool[] Disabled; // Set to 'true' when the form closes public bool Completed { get { return completed; } } bool completed; + private readonly int cmbndWMsCount; + public CycleBeginningForm() { InitializeComponent(); @@ -32,48 +35,96 @@ namespace TBF.BenchControl.DataEntry.Combined completed = false; StartForceCloseHandler(); - if (Program.WMsCount / 2 < 2) Height = 200; - else if (Program.WMsCount / 2 < 3) Height = 355; + cmbndWMsCount = Program.WMsCount / 2; + Height = 145 + cmbndWMsCount * 155; + } + + private void CycleBeginningForm_Load(object sender, EventArgs e) + { Localize(); + + PrepareOrderCombo(orderComboBox); + + if (cmbndWMsCount < 1) groupBox1.Visible = false; + if (cmbndWMsCount < 2) groupBox2.Visible = false; + if (cmbndWMsCount < 3) groupBox3.Visible = false; } void Localize() { Text = Strings.Data; + orderGroupBox.Text = Strings.Purchase_Order; groupBox1.Text = Strings.Water_Meter + " 1"; - mainSN1Label.Text = Strings.Main_WM_SerialNr; - auxSN1Label.Text = Strings.Aux_WM_SerialNr; groupBox2.Text = Strings.Water_Meter + " 2"; - mainSN2Label.Text = Strings.Main_WM_SerialNr; - auxSN2Label.Text = Strings.Aux_WM_SerialNr; groupBox3.Text = Strings.Water_Meter + " 3"; + mainSN1Label.Text = Strings.Main_WM_SerialNr; + mainSN2Label.Text = Strings.Main_WM_SerialNr; mainSN3Label.Text = Strings.Main_WM_SerialNr; + auxSN1Label.Text = Strings.Aux_WM_SerialNr; + auxSN2Label.Text = Strings.Aux_WM_SerialNr; auxSN3Label.Text = Strings.Aux_WM_SerialNr; okButton.Text = Strings.OkBtnText; } + /// + /// Load Purchase order combo box items from the LocalSettings PurchaseOrderHistory array + /// + /// Puchase order ComboBox + void PrepareOrderCombo(ComboBox orderComboBox) + { + for (int i = 0; i < Program.LocalSettings.PurchaseOrderHistoryCount; i++) + { + orderComboBox.Items.Add(Program.LocalSettings.PurchaseOrderHistory[i]); + } + + if (orderComboBox.Items.Count > 0) + { + orderComboBox.Text = orderComboBox.Items[0].ToString(); + } + } + private void okButton_Click(object sender, EventArgs e) { - MainSNText[0] = mainSN1TextBox.Text; - AuxSNText[0] = auxSN1TextBox.Text; + PurchaseOrder = orderComboBox.Text; + Program.LocalSettings.UpdateHistory(orderComboBox.Text, + ref Program.LocalSettings.PurchaseOrderHistory +#if FUZHOU150 || FUZHOU300 + , 20 +#endif + ); - if (Program.WMsCount / 2 >= 2) + if (cmbndWMsCount >= 1) + { + MainSNText[0] = mainSN1TextBox.Text; + AuxSNText[0] = auxSN1TextBox.Text; + Disabled[0] = !checkBox1.Checked; + } + + if (cmbndWMsCount >= 2) { MainSNText[1] = mainSN2TextBox.Text; AuxSNText[1] = auxSN2TextBox.Text; + Disabled[1] = !checkBox2.Checked; } - if (Program.WMsCount / 2 >= 3) + if (cmbndWMsCount >= 3) { MainSNText[2] = mainSN3TextBox.Text; AuxSNText[2] = auxSN3TextBox.Text; + Disabled[2] = !checkBox3.Checked; } completed = true; Close(); } + private void clearButton_Click(object sender, EventArgs e) + { + + } + + #region Forced close handling public void StartForceCloseHandler() diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.resx index 714731c15..1af7de150 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.resx +++ b/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.resx @@ -117,52 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs index 097c6ca39..4be717be7 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs @@ -110,11 +110,11 @@ namespace TBF.BenchControl.DataEntry.Standard { PurchaseOrder = orderComboBox.Text; Program.LocalSettings.UpdateHistory(orderComboBox.Text, - ref Program.LocalSettings.PurchaseOrderHistory + ref Program.LocalSettings.PurchaseOrderHistory #if FUZHOU150 || FUZHOU300 - , 20 + , 20 #endif - ); + ); Program.LocalSettings.LastSNTexts = SNText;