diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs index 4dc0a890c..71e0779ef 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs @@ -34,6 +34,8 @@ namespace TBF.BenchControl.DataEntry.Munich this.mainState1TextBox = new System.Windows.Forms.TextBox(); this.mainState1Label = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.yearOfProduction1Label = new System.Windows.Forms.Label(); + this.yearOfProduction1TextBox = new System.Windows.Forms.TextBox(); this.qFall1Label = new System.Windows.Forms.Label(); this.qFall1TextBox = new System.Windows.Forms.TextBox(); this.qRise1Label = new System.Windows.Forms.Label(); @@ -42,10 +44,13 @@ namespace TBF.BenchControl.DataEntry.Munich this.auxState1Label = new System.Windows.Forms.Label(); this.okButton = new System.Windows.Forms.Button(); this.protocolGroupBox = new System.Windows.Forms.GroupBox(); + this.radioButton4 = new System.Windows.Forms.RadioButton(); this.radioButton3 = new System.Windows.Forms.RadioButton(); this.radioButton2 = new System.Windows.Forms.RadioButton(); this.radioButton1 = new System.Windows.Forms.RadioButton(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.yearOfProduction2Label = new System.Windows.Forms.Label(); + this.yearOfProduction2TextBox = new System.Windows.Forms.TextBox(); this.qFall2Label = new System.Windows.Forms.Label(); this.qFall2TextBox = new System.Windows.Forms.TextBox(); this.qRise2Label = new System.Windows.Forms.Label(); @@ -55,6 +60,8 @@ namespace TBF.BenchControl.DataEntry.Munich this.auxState2TextBox = new System.Windows.Forms.TextBox(); this.auxState2Label = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.yearOfProduction3Label = new System.Windows.Forms.Label(); + this.yearOfProduction3TextBox = new System.Windows.Forms.TextBox(); this.qFall3Label = new System.Windows.Forms.Label(); this.qFall3TextBox = new System.Windows.Forms.TextBox(); this.qRise3Label = new System.Windows.Forms.Label(); @@ -63,7 +70,6 @@ namespace TBF.BenchControl.DataEntry.Munich this.mainState3Label = new System.Windows.Forms.Label(); this.auxState3TextBox = new System.Windows.Forms.TextBox(); this.auxState3Label = new System.Windows.Forms.Label(); - this.radioButton4 = new System.Windows.Forms.RadioButton(); this.groupBox1.SuspendLayout(); this.protocolGroupBox.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -72,7 +78,7 @@ namespace TBF.BenchControl.DataEntry.Munich // // mainState1TextBox // - this.mainState1TextBox.Location = new System.Drawing.Point(211, 42); + this.mainState1TextBox.Location = new System.Drawing.Point(211, 34); this.mainState1TextBox.Name = "mainState1TextBox"; this.mainState1TextBox.Size = new System.Drawing.Size(135, 31); this.mainState1TextBox.TabIndex = 1; @@ -80,7 +86,7 @@ namespace TBF.BenchControl.DataEntry.Munich // mainState1Label // this.mainState1Label.AutoSize = true; - this.mainState1Label.Location = new System.Drawing.Point(18, 45); + this.mainState1Label.Location = new System.Drawing.Point(18, 37); this.mainState1Label.Name = "mainState1Label"; this.mainState1Label.Size = new System.Drawing.Size(153, 23); this.mainState1Label.TabIndex = 0; @@ -88,6 +94,8 @@ namespace TBF.BenchControl.DataEntry.Munich // // groupBox1 // + this.groupBox1.Controls.Add(this.yearOfProduction1Label); + this.groupBox1.Controls.Add(this.yearOfProduction1TextBox); this.groupBox1.Controls.Add(this.qFall1Label); this.groupBox1.Controls.Add(this.qFall1TextBox); this.groupBox1.Controls.Add(this.qRise1Label); @@ -105,10 +113,26 @@ namespace TBF.BenchControl.DataEntry.Munich this.groupBox1.TabStop = false; this.groupBox1.Text = "Water Meter 1"; // + // yearOfProduction1Label + // + this.yearOfProduction1Label.AutoSize = true; + this.yearOfProduction1Label.Location = new System.Drawing.Point(18, 197); + this.yearOfProduction1Label.Name = "yearOfProduction1Label"; + this.yearOfProduction1Label.Size = new System.Drawing.Size(188, 23); + this.yearOfProduction1Label.TabIndex = 8; + this.yearOfProduction1Label.Text = "Year of production"; + // + // yearOfProduction1TextBox + // + this.yearOfProduction1TextBox.Location = new System.Drawing.Point(211, 190); + this.yearOfProduction1TextBox.Name = "yearOfProduction1TextBox"; + this.yearOfProduction1TextBox.Size = new System.Drawing.Size(135, 31); + this.yearOfProduction1TextBox.TabIndex = 9; + // // qFall1Label // this.qFall1Label.AutoSize = true; - this.qFall1Label.Location = new System.Drawing.Point(18, 184); + this.qFall1Label.Location = new System.Drawing.Point(18, 158); this.qFall1Label.Name = "qFall1Label"; this.qFall1Label.Size = new System.Drawing.Size(55, 23); this.qFall1Label.TabIndex = 6; @@ -116,7 +140,7 @@ namespace TBF.BenchControl.DataEntry.Munich // // qFall1TextBox // - this.qFall1TextBox.Location = new System.Drawing.Point(211, 177); + this.qFall1TextBox.Location = new System.Drawing.Point(211, 151); this.qFall1TextBox.Name = "qFall1TextBox"; this.qFall1TextBox.Size = new System.Drawing.Size(135, 31); this.qFall1TextBox.TabIndex = 7; @@ -124,7 +148,7 @@ namespace TBF.BenchControl.DataEntry.Munich // qRise1Label // this.qRise1Label.AutoSize = true; - this.qRise1Label.Location = new System.Drawing.Point(18, 135); + this.qRise1Label.Location = new System.Drawing.Point(18, 115); this.qRise1Label.Name = "qRise1Label"; this.qRise1Label.Size = new System.Drawing.Size(60, 23); this.qRise1Label.TabIndex = 4; @@ -132,14 +156,14 @@ namespace TBF.BenchControl.DataEntry.Munich // // qRise1TextBox // - this.qRise1TextBox.Location = new System.Drawing.Point(211, 132); + this.qRise1TextBox.Location = new System.Drawing.Point(211, 112); this.qRise1TextBox.Name = "qRise1TextBox"; this.qRise1TextBox.Size = new System.Drawing.Size(135, 31); this.qRise1TextBox.TabIndex = 5; // // auxState1TextBox // - this.auxState1TextBox.Location = new System.Drawing.Point(211, 87); + this.auxState1TextBox.Location = new System.Drawing.Point(211, 73); this.auxState1TextBox.Name = "auxState1TextBox"; this.auxState1TextBox.Size = new System.Drawing.Size(135, 31); this.auxState1TextBox.TabIndex = 3; @@ -147,7 +171,7 @@ namespace TBF.BenchControl.DataEntry.Munich // auxState1Label // this.auxState1Label.AutoSize = true; - this.auxState1Label.Location = new System.Drawing.Point(18, 90); + this.auxState1Label.Location = new System.Drawing.Point(18, 76); this.auxState1Label.Name = "auxState1Label"; this.auxState1Label.Size = new System.Drawing.Size(151, 23); this.auxState1Label.TabIndex = 2; @@ -179,6 +203,17 @@ namespace TBF.BenchControl.DataEntry.Munich this.protocolGroupBox.TabStop = false; this.protocolGroupBox.Text = "Protocol"; // + // radioButton4 + // + this.radioButton4.AutoSize = true; + this.radioButton4.Location = new System.Drawing.Point(34, 133); + this.radioButton4.Name = "radioButton4"; + this.radioButton4.Size = new System.Drawing.Size(152, 27); + this.radioButton4.TabIndex = 3; + this.radioButton4.Text = "radioButton4"; + this.radioButton4.UseVisualStyleBackColor = true; + this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged); + // // radioButton3 // this.radioButton3.AutoSize = true; @@ -188,6 +223,7 @@ namespace TBF.BenchControl.DataEntry.Munich this.radioButton3.TabIndex = 2; this.radioButton3.Text = "radioButton3"; this.radioButton3.UseVisualStyleBackColor = true; + this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged); // // radioButton2 // @@ -198,6 +234,7 @@ namespace TBF.BenchControl.DataEntry.Munich this.radioButton2.TabIndex = 1; this.radioButton2.Text = "radioButton2"; this.radioButton2.UseVisualStyleBackColor = true; + this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); // // radioButton1 // @@ -210,9 +247,12 @@ namespace TBF.BenchControl.DataEntry.Munich this.radioButton1.TabStop = true; this.radioButton1.Text = "radioButton1"; this.radioButton1.UseVisualStyleBackColor = true; + this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); // // groupBox2 // + this.groupBox2.Controls.Add(this.yearOfProduction2Label); + this.groupBox2.Controls.Add(this.yearOfProduction2TextBox); this.groupBox2.Controls.Add(this.qFall2Label); this.groupBox2.Controls.Add(this.qFall2TextBox); this.groupBox2.Controls.Add(this.qRise2Label); @@ -230,10 +270,26 @@ namespace TBF.BenchControl.DataEntry.Munich this.groupBox2.TabStop = false; this.groupBox2.Text = "Water Meter 2"; // + // yearOfProduction2Label + // + this.yearOfProduction2Label.AutoSize = true; + this.yearOfProduction2Label.Location = new System.Drawing.Point(18, 197); + this.yearOfProduction2Label.Name = "yearOfProduction2Label"; + this.yearOfProduction2Label.Size = new System.Drawing.Size(188, 23); + this.yearOfProduction2Label.TabIndex = 8; + this.yearOfProduction2Label.Text = "Year of production"; + // + // yearOfProduction2TextBox + // + this.yearOfProduction2TextBox.Location = new System.Drawing.Point(211, 190); + this.yearOfProduction2TextBox.Name = "yearOfProduction2TextBox"; + this.yearOfProduction2TextBox.Size = new System.Drawing.Size(135, 31); + this.yearOfProduction2TextBox.TabIndex = 9; + // // qFall2Label // this.qFall2Label.AutoSize = true; - this.qFall2Label.Location = new System.Drawing.Point(18, 184); + this.qFall2Label.Location = new System.Drawing.Point(18, 158); this.qFall2Label.Name = "qFall2Label"; this.qFall2Label.Size = new System.Drawing.Size(55, 23); this.qFall2Label.TabIndex = 6; @@ -241,7 +297,7 @@ namespace TBF.BenchControl.DataEntry.Munich // // qFall2TextBox // - this.qFall2TextBox.Location = new System.Drawing.Point(211, 177); + this.qFall2TextBox.Location = new System.Drawing.Point(211, 151); this.qFall2TextBox.Name = "qFall2TextBox"; this.qFall2TextBox.Size = new System.Drawing.Size(135, 31); this.qFall2TextBox.TabIndex = 7; @@ -249,7 +305,7 @@ namespace TBF.BenchControl.DataEntry.Munich // qRise2Label // this.qRise2Label.AutoSize = true; - this.qRise2Label.Location = new System.Drawing.Point(18, 135); + this.qRise2Label.Location = new System.Drawing.Point(18, 115); this.qRise2Label.Name = "qRise2Label"; this.qRise2Label.Size = new System.Drawing.Size(60, 23); this.qRise2Label.TabIndex = 4; @@ -257,14 +313,14 @@ namespace TBF.BenchControl.DataEntry.Munich // // qRise2TextBox // - this.qRise2TextBox.Location = new System.Drawing.Point(211, 132); + this.qRise2TextBox.Location = new System.Drawing.Point(211, 112); this.qRise2TextBox.Name = "qRise2TextBox"; this.qRise2TextBox.Size = new System.Drawing.Size(135, 31); this.qRise2TextBox.TabIndex = 5; // // mainState2TextBox // - this.mainState2TextBox.Location = new System.Drawing.Point(211, 42); + this.mainState2TextBox.Location = new System.Drawing.Point(211, 34); this.mainState2TextBox.Name = "mainState2TextBox"; this.mainState2TextBox.Size = new System.Drawing.Size(135, 31); this.mainState2TextBox.TabIndex = 1; @@ -272,7 +328,7 @@ namespace TBF.BenchControl.DataEntry.Munich // mainState2Label // this.mainState2Label.AutoSize = true; - this.mainState2Label.Location = new System.Drawing.Point(17, 45); + this.mainState2Label.Location = new System.Drawing.Point(17, 37); this.mainState2Label.Name = "mainState2Label"; this.mainState2Label.Size = new System.Drawing.Size(153, 23); this.mainState2Label.TabIndex = 0; @@ -280,7 +336,7 @@ namespace TBF.BenchControl.DataEntry.Munich // // auxState2TextBox // - this.auxState2TextBox.Location = new System.Drawing.Point(211, 87); + this.auxState2TextBox.Location = new System.Drawing.Point(211, 73); this.auxState2TextBox.Name = "auxState2TextBox"; this.auxState2TextBox.Size = new System.Drawing.Size(135, 31); this.auxState2TextBox.TabIndex = 3; @@ -288,7 +344,7 @@ namespace TBF.BenchControl.DataEntry.Munich // auxState2Label // this.auxState2Label.AutoSize = true; - this.auxState2Label.Location = new System.Drawing.Point(18, 90); + this.auxState2Label.Location = new System.Drawing.Point(18, 76); this.auxState2Label.Name = "auxState2Label"; this.auxState2Label.Size = new System.Drawing.Size(151, 23); this.auxState2Label.TabIndex = 2; @@ -296,6 +352,8 @@ namespace TBF.BenchControl.DataEntry.Munich // // groupBox3 // + this.groupBox3.Controls.Add(this.yearOfProduction3Label); + this.groupBox3.Controls.Add(this.yearOfProduction3TextBox); this.groupBox3.Controls.Add(this.qFall3Label); this.groupBox3.Controls.Add(this.qFall3TextBox); this.groupBox3.Controls.Add(this.qRise3Label); @@ -313,10 +371,26 @@ namespace TBF.BenchControl.DataEntry.Munich this.groupBox3.TabStop = false; this.groupBox3.Text = "Water Meter 3"; // + // yearOfProduction3Label + // + this.yearOfProduction3Label.AutoSize = true; + this.yearOfProduction3Label.Location = new System.Drawing.Point(18, 197); + this.yearOfProduction3Label.Name = "yearOfProduction3Label"; + this.yearOfProduction3Label.Size = new System.Drawing.Size(188, 23); + this.yearOfProduction3Label.TabIndex = 8; + this.yearOfProduction3Label.Text = "Year of production"; + // + // yearOfProduction3TextBox + // + this.yearOfProduction3TextBox.Location = new System.Drawing.Point(211, 190); + this.yearOfProduction3TextBox.Name = "yearOfProduction3TextBox"; + this.yearOfProduction3TextBox.Size = new System.Drawing.Size(135, 31); + this.yearOfProduction3TextBox.TabIndex = 9; + // // qFall3Label // this.qFall3Label.AutoSize = true; - this.qFall3Label.Location = new System.Drawing.Point(18, 184); + this.qFall3Label.Location = new System.Drawing.Point(18, 158); this.qFall3Label.Name = "qFall3Label"; this.qFall3Label.Size = new System.Drawing.Size(55, 23); this.qFall3Label.TabIndex = 6; @@ -324,7 +398,7 @@ namespace TBF.BenchControl.DataEntry.Munich // // qFall3TextBox // - this.qFall3TextBox.Location = new System.Drawing.Point(211, 177); + this.qFall3TextBox.Location = new System.Drawing.Point(211, 151); this.qFall3TextBox.Name = "qFall3TextBox"; this.qFall3TextBox.Size = new System.Drawing.Size(135, 31); this.qFall3TextBox.TabIndex = 7; @@ -332,7 +406,7 @@ namespace TBF.BenchControl.DataEntry.Munich // qRise3Label // this.qRise3Label.AutoSize = true; - this.qRise3Label.Location = new System.Drawing.Point(18, 135); + this.qRise3Label.Location = new System.Drawing.Point(18, 115); this.qRise3Label.Name = "qRise3Label"; this.qRise3Label.Size = new System.Drawing.Size(60, 23); this.qRise3Label.TabIndex = 4; @@ -340,14 +414,14 @@ namespace TBF.BenchControl.DataEntry.Munich // // qRise3TextBox // - this.qRise3TextBox.Location = new System.Drawing.Point(211, 132); + this.qRise3TextBox.Location = new System.Drawing.Point(211, 112); this.qRise3TextBox.Name = "qRise3TextBox"; this.qRise3TextBox.Size = new System.Drawing.Size(135, 31); this.qRise3TextBox.TabIndex = 5; // // mainState3TextBox // - this.mainState3TextBox.Location = new System.Drawing.Point(211, 42); + this.mainState3TextBox.Location = new System.Drawing.Point(211, 34); this.mainState3TextBox.Name = "mainState3TextBox"; this.mainState3TextBox.Size = new System.Drawing.Size(135, 31); this.mainState3TextBox.TabIndex = 1; @@ -355,7 +429,7 @@ namespace TBF.BenchControl.DataEntry.Munich // mainState3Label // this.mainState3Label.AutoSize = true; - this.mainState3Label.Location = new System.Drawing.Point(18, 45); + this.mainState3Label.Location = new System.Drawing.Point(18, 37); this.mainState3Label.Name = "mainState3Label"; this.mainState3Label.Size = new System.Drawing.Size(153, 23); this.mainState3Label.TabIndex = 0; @@ -363,7 +437,7 @@ namespace TBF.BenchControl.DataEntry.Munich // // auxState3TextBox // - this.auxState3TextBox.Location = new System.Drawing.Point(211, 87); + this.auxState3TextBox.Location = new System.Drawing.Point(211, 73); this.auxState3TextBox.Name = "auxState3TextBox"; this.auxState3TextBox.Size = new System.Drawing.Size(135, 31); this.auxState3TextBox.TabIndex = 3; @@ -371,22 +445,12 @@ namespace TBF.BenchControl.DataEntry.Munich // auxState3Label // this.auxState3Label.AutoSize = true; - this.auxState3Label.Location = new System.Drawing.Point(18, 90); + this.auxState3Label.Location = new System.Drawing.Point(18, 76); this.auxState3Label.Name = "auxState3Label"; this.auxState3Label.Size = new System.Drawing.Size(151, 23); this.auxState3Label.TabIndex = 2; this.auxState3Label.Text = "Aux. WM State"; // - // radioButton4 - // - this.radioButton4.AutoSize = true; - this.radioButton4.Location = new System.Drawing.Point(34, 133); - this.radioButton4.Name = "radioButton4"; - this.radioButton4.Size = new System.Drawing.Size(152, 27); - this.radioButton4.TabIndex = 3; - this.radioButton4.Text = "radioButton4"; - this.radioButton4.UseVisualStyleBackColor = true; - // // CycleEndForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -451,6 +515,12 @@ namespace TBF.BenchControl.DataEntry.Munich private System.Windows.Forms.TextBox auxState3TextBox; private System.Windows.Forms.Label auxState3Label; private System.Windows.Forms.RadioButton radioButton4; + private System.Windows.Forms.Label yearOfProduction1Label; + private System.Windows.Forms.TextBox yearOfProduction1TextBox; + private System.Windows.Forms.Label yearOfProduction2Label; + private System.Windows.Forms.TextBox yearOfProduction2TextBox; + private System.Windows.Forms.Label yearOfProduction3Label; + private System.Windows.Forms.TextBox yearOfProduction3TextBox; } } \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs index 9aa41532f..49160bce8 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs @@ -21,11 +21,12 @@ namespace TBF.BenchControl.DataEntry.Munich public string ProtocolName4; // To be retrieved after the form closes - public string[] MainStateText; + public string ProtocolTitle; + public string[] MainStateText; public string[] AuxStateText; public float[] QRise; public float[] QFall; - public string ProtocolTitle; + public int[] YearOfProduction; // Set to 'true' when the form closes public bool Completed { get { return completed; } } @@ -39,10 +40,11 @@ namespace TBF.BenchControl.DataEntry.Munich AuxStateText = new string[Config.Data.CompoundWMsCount]; QRise = new float[Config.Data.CompoundWMsCount]; QFall = new float[Config.Data.CompoundWMsCount]; - completed = false; + YearOfProduction = new int[Config.Data.CompoundWMsCount]; + completed = false; StartForceCloseHandler(); - Localize(); + Localize(); } void Localize() @@ -54,19 +56,24 @@ namespace TBF.BenchControl.DataEntry.Munich auxState1Label.Text = Strings.Aux_Water_Meter_State; qRise1Label.Text = Strings.Qrise; qFall1Label.Text = Strings.Qfall; + yearOfProduction1Label.Text = Strings.Year_of_production; groupBox2.Text = Strings.Water_Meter + " 2"; mainState2Label.Text = Strings.Main_Water_Meter_State; auxState2Label.Text = Strings.Aux_Water_Meter_State; qRise2Label.Text = Strings.Qrise; qFall2Label.Text = Strings.Qfall; + yearOfProduction2Label.Text = Strings.Year_of_production; groupBox3.Text = Strings.Water_Meter + " 3"; mainState3Label.Text = Strings.Main_Water_Meter_State; auxState3Label.Text = Strings.Aux_Water_Meter_State; qRise3Label.Text = Strings.Qrise; qFall3Label.Text = Strings.Qfall; - } + yearOfProduction3Label.Text = Strings.Year_of_production; + + AnyRadioButtonChanged(); + } private void CycleEndForm_Load(object sender, EventArgs e) { @@ -79,13 +86,15 @@ namespace TBF.BenchControl.DataEntry.Munich { qRise1TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[0].QRise, 3); qFall1TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[0].QFall, 3); + yearOfProduction1TextBox.Text = Sequences.ProcessData.BatchRslts.WaterMeters[0].YearOfProduction.ToString(); } if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 2) { qRise2TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[1].QRise, 3); qFall2TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[1].QFall, 3); - } + yearOfProduction2TextBox.Text = Sequences.ProcessData.BatchRslts.WaterMeters[1].YearOfProduction.ToString(); + } else { groupBox2.Visible = false; @@ -96,7 +105,8 @@ namespace TBF.BenchControl.DataEntry.Munich { qRise3TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[2].QRise, 3); qFall3TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[2].QFall, 3); - } + yearOfProduction3TextBox.Text = Sequences.ProcessData.BatchRslts.WaterMeters[2].YearOfProduction.ToString(); + } else { groupBox3.Visible = false; @@ -106,12 +116,17 @@ namespace TBF.BenchControl.DataEntry.Munich private void okButton_Click(object sender, EventArgs e) { float ftmp; + int year; bool allOK = true; MainStateText[0] = mainState1TextBox.Text; AuxStateText[0] = auxState1TextBox.Text; if (Utils.TryParseUFloat(qRise1TextBox.Text, out ftmp)) { QRise[0] = ftmp; } else { allOK = false; } if (Utils.TryParseUFloat(qFall1TextBox.Text, out ftmp)) { QFall[0] = ftmp; } else { allOK = false; } + if ((radioButton3.Checked || radioButton4.Checked) && int.TryParse(yearOfProduction1TextBox.Text, out year)) + { + YearOfProduction[0] = year; + } if (Config.Data.CompoundWMsCount >= 2) { @@ -119,6 +134,10 @@ namespace TBF.BenchControl.DataEntry.Munich AuxStateText[1] = auxState2TextBox.Text; if (Utils.TryParseUFloat(qRise2TextBox.Text, out ftmp)) { QRise[1] = ftmp; } else { allOK = false; } if (Utils.TryParseUFloat(qFall2TextBox.Text, out ftmp)) { QFall[1] = ftmp; } else { allOK = false; } + if ((radioButton3.Checked || radioButton4.Checked) && int.TryParse(yearOfProduction2TextBox.Text, out year)) + { + YearOfProduction[1] = year; + } } if (Config.Data.CompoundWMsCount >= 3) @@ -127,7 +146,11 @@ namespace TBF.BenchControl.DataEntry.Munich AuxStateText[2] = auxState3TextBox.Text; if (Utils.TryParseUFloat(qRise3TextBox.Text, out ftmp)) { QRise[2] = ftmp; } else { allOK = false; } if (Utils.TryParseUFloat(qFall3TextBox.Text, out ftmp)) { QFall[2] = ftmp; } else { allOK = false; } - } + if ((radioButton3.Checked || radioButton4.Checked) && int.TryParse(yearOfProduction3TextBox.Text, out year)) + { + YearOfProduction[2] = year; + } + } if (radioButton1.Checked) ProtocolTitle = ProtocolName1; else if (radioButton2.Checked) ProtocolTitle = ProtocolName2; @@ -159,5 +182,24 @@ namespace TBF.BenchControl.DataEntry.Munich } #endregion + + private void radioButton1_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } + private void radioButton2_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } + private void radioButton3_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } + private void radioButton4_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } + + void AnyRadioButtonChanged() + { + if (radioButton3.Checked || radioButton4.Checked) + { + yearOfProduction1TextBox.Visible = yearOfProduction2TextBox.Visible = yearOfProduction3TextBox.Visible = true; + yearOfProduction1Label.Visible = yearOfProduction2Label.Visible = yearOfProduction3Label.Visible = true; + } + else + { + yearOfProduction1TextBox.Visible = yearOfProduction2TextBox.Visible = yearOfProduction3TextBox.Visible = false; + yearOfProduction1Label.Visible = yearOfProduction2Label.Visible = yearOfProduction3Label.Visible = false; + } + } } } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx index 21cf58d0d..1af7de150 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx @@ -117,169 +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 - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - 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/Munich/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs index dbcbbac4e..4e416aad4 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs @@ -153,12 +153,30 @@ namespace TBF.BenchControl.DataEntry.Munich } else if (modelessDlg is CycleEndForm) { - if (count >= 1 && wMeters[0] != null) wMeters[0].EndState = (modelessDlg as CycleEndForm).MainStateText[0]; - if (count >= 1 && wMeters[0] != null) wMeters[0].EndStateAux = (modelessDlg as CycleEndForm).AuxStateText[0]; - if (count >= 2 && wMeters[1] != null) wMeters[1].EndState = (modelessDlg as CycleEndForm).MainStateText[1]; - if (count >= 2 && wMeters[1] != null) wMeters[1].EndStateAux = (modelessDlg as CycleEndForm).AuxStateText[1]; - if (count >= 3 && wMeters[2] != null) wMeters[2].EndState = (modelessDlg as CycleEndForm).MainStateText[2]; - if (count >= 3 && wMeters[2] != null) wMeters[2].EndStateAux = (modelessDlg as CycleEndForm).AuxStateText[2]; + if (count >= 1 && wMeters[0] != null) + { + wMeters[0].EndState = (modelessDlg as CycleEndForm).MainStateText[0]; + wMeters[0].EndStateAux = (modelessDlg as CycleEndForm).AuxStateText[0]; + wMeters[0].QRise = (modelessDlg as CycleEndForm).QRise[0]; + wMeters[0].QFall = (modelessDlg as CycleEndForm).QFall[0]; + wMeters[0].YearOfProduction = (modelessDlg as CycleEndForm).YearOfProduction[0]; + } + if (count >= 2 && wMeters[1] != null) + { + wMeters[1].EndState = (modelessDlg as CycleEndForm).MainStateText[1]; + wMeters[1].EndStateAux = (modelessDlg as CycleEndForm).AuxStateText[1]; + wMeters[1].QRise = (modelessDlg as CycleEndForm).QRise[1]; + wMeters[1].QFall = (modelessDlg as CycleEndForm).QFall[1]; + wMeters[1].YearOfProduction = (modelessDlg as CycleEndForm).YearOfProduction[1]; + } + if (count >= 3 && wMeters[2] != null) + { + wMeters[2].EndState = (modelessDlg as CycleEndForm).MainStateText[2]; + wMeters[2].EndStateAux = (modelessDlg as CycleEndForm).AuxStateText[2]; + wMeters[2].QRise = (modelessDlg as CycleEndForm).QRise[2]; + wMeters[2].QFall = (modelessDlg as CycleEndForm).QFall[2]; + wMeters[2].YearOfProduction = (modelessDlg as CycleEndForm).YearOfProduction[2]; + } protocolTitle = (modelessDlg as CycleEndForm).ProtocolTitle; } resultSaved = true; diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs index dd2e22771..3b50d1796 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs @@ -31,306 +31,443 @@ namespace TBF.BenchControl.DataEntry.Munich3 /// private void InitializeComponent() { - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.okButton = new System.Windows.Forms.Button(); - this.protocolGroupBox = new System.Windows.Forms.GroupBox(); - this.radioButton3 = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.groupBox2.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.protocolGroupBox.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.SuspendLayout(); - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.textBox2); - this.groupBox2.Controls.Add(this.label2); - 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(25, 251); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(362, 81); - this.groupBox2.TabIndex = 2; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Wasserzähler 2"; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(183, 31); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(163, 31); - this.textBox2.TabIndex = 1; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 34); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(74, 23); - this.label2.TabIndex = 0; - this.label2.Text = "Stand:"; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.textBox1); - this.groupBox1.Controls.Add(this.label1); - 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(25, 161); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(362, 81); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Wasserzähler 1"; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(183, 31); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(163, 31); - this.textBox1.TabIndex = 1; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(18, 34); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(74, 23); - this.label1.TabIndex = 0; - this.label1.Text = "Stand:"; - // - // 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(425, 23); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(98, 63); - this.okButton.TabIndex = 7; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // protocolGroupBox - // - this.protocolGroupBox.Controls.Add(this.radioButton3); - this.protocolGroupBox.Controls.Add(this.radioButton2); - this.protocolGroupBox.Controls.Add(this.radioButton1); - this.protocolGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.protocolGroupBox.Location = new System.Drawing.Point(25, 13); - this.protocolGroupBox.Name = "protocolGroupBox"; - this.protocolGroupBox.Size = new System.Drawing.Size(362, 142); - this.protocolGroupBox.TabIndex = 0; - this.protocolGroupBox.TabStop = false; - this.protocolGroupBox.Text = "Protokoll"; - // - // radioButton3 - // - this.radioButton3.AutoSize = true; - this.radioButton3.Location = new System.Drawing.Point(34, 100); - this.radioButton3.Name = "radioButton3"; - this.radioButton3.Size = new System.Drawing.Size(152, 27); - this.radioButton3.TabIndex = 2; - this.radioButton3.TabStop = true; - this.radioButton3.Text = "radioButton3"; - this.radioButton3.UseVisualStyleBackColor = true; - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.Location = new System.Drawing.Point(34, 67); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(152, 27); - this.radioButton2.TabIndex = 1; - this.radioButton2.TabStop = true; - this.radioButton2.Text = "radioButton2"; - this.radioButton2.UseVisualStyleBackColor = true; - // - // radioButton1 - // - this.radioButton1.AutoSize = true; - this.radioButton1.Checked = true; - this.radioButton1.Location = new System.Drawing.Point(34, 34); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(152, 27); - this.radioButton1.TabIndex = 0; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "radioButton1"; - this.radioButton1.UseVisualStyleBackColor = true; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.textBox3); - this.groupBox3.Controls.Add(this.label3); - 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(25, 341); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(362, 81); - this.groupBox3.TabIndex = 3; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Wasserzähler 3"; - // - // textBox3 - // - this.textBox3.Location = new System.Drawing.Point(183, 31); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(163, 31); - this.textBox3.TabIndex = 1; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(18, 34); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 23); - this.label3.TabIndex = 0; - this.label3.Text = "Stand:"; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.textBox4); - this.groupBox4.Controls.Add(this.label4); - this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox4.ForeColor = System.Drawing.Color.Black; - this.groupBox4.Location = new System.Drawing.Point(25, 431); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(362, 81); - this.groupBox4.TabIndex = 4; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "Wasserzähler 4"; - // - // textBox4 - // - this.textBox4.Location = new System.Drawing.Point(183, 31); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(163, 31); - this.textBox4.TabIndex = 1; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(18, 34); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 23); - this.label4.TabIndex = 0; - this.label4.Text = "Stand:"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.textBox5); - this.groupBox5.Controls.Add(this.label5); - this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox5.ForeColor = System.Drawing.Color.Black; - this.groupBox5.Location = new System.Drawing.Point(25, 521); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(362, 81); - this.groupBox5.TabIndex = 5; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "Wasserzähler 5"; - // - // textBox5 - // - this.textBox5.Location = new System.Drawing.Point(183, 31); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(163, 31); - this.textBox5.TabIndex = 1; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(18, 34); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(74, 23); - this.label5.TabIndex = 0; - this.label5.Text = "Stand:"; - // - // groupBox6 - // - this.groupBox6.Controls.Add(this.textBox6); - this.groupBox6.Controls.Add(this.label6); - this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.groupBox6.ForeColor = System.Drawing.Color.Black; - this.groupBox6.Location = new System.Drawing.Point(25, 611); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(362, 81); - this.groupBox6.TabIndex = 6; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "Wasserzähler 6"; - // - // textBox6 - // - this.textBox6.Location = new System.Drawing.Point(183, 31); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(163, 31); - this.textBox6.TabIndex = 1; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(18, 34); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(74, 23); - this.label6.TabIndex = 0; - this.label6.Text = "Stand:"; - // - // CycleEndForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(559, 713); - this.Controls.Add(this.groupBox6); - this.Controls.Add(this.groupBox5); - this.Controls.Add(this.groupBox4); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.protocolGroupBox); - this.Controls.Add(this.okButton); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "CycleEndForm"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.Text = "Daten"; - this.TopMost = true; - this.Load += new System.EventHandler(this.CycleEndForm_Load); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.protocolGroupBox.ResumeLayout(false); - this.protocolGroupBox.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.ResumeLayout(false); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.okButton = new System.Windows.Forms.Button(); + this.protocolGroupBox = new System.Windows.Forms.GroupBox(); + this.radioButton3 = new System.Windows.Forms.RadioButton(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.radioButton4 = new System.Windows.Forms.RadioButton(); + this.yearOfProduction1Label = new System.Windows.Forms.Label(); + this.yearOfProduction2Label = new System.Windows.Forms.Label(); + this.yearOfProduction3Label = new System.Windows.Forms.Label(); + this.yearOfProduction4Label = new System.Windows.Forms.Label(); + this.yearOfProduction5Label = new System.Windows.Forms.Label(); + this.yearOfProduction6Label = new System.Windows.Forms.Label(); + this.yearOfProduction1TextBox = new System.Windows.Forms.TextBox(); + this.yearOfProduction2TextBox = new System.Windows.Forms.TextBox(); + this.yearOfProduction3TextBox = new System.Windows.Forms.TextBox(); + this.yearOfProduction4TextBox = new System.Windows.Forms.TextBox(); + this.yearOfProduction5TextBox = new System.Windows.Forms.TextBox(); + this.yearOfProduction6TextBox = new System.Windows.Forms.TextBox(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.protocolGroupBox.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.groupBox5.SuspendLayout(); + this.groupBox6.SuspendLayout(); + this.SuspendLayout(); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.yearOfProduction2TextBox); + this.groupBox2.Controls.Add(this.yearOfProduction2Label); + this.groupBox2.Controls.Add(this.textBox2); + this.groupBox2.Controls.Add(this.label2); + 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(25, 284); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(682, 81); + this.groupBox2.TabIndex = 2; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Wasserzähler 2"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(160, 31); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(163, 31); + this.textBox2.TabIndex = 1; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(18, 34); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(74, 23); + this.label2.TabIndex = 0; + this.label2.Text = "Stand:"; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.yearOfProduction1TextBox); + this.groupBox1.Controls.Add(this.yearOfProduction1Label); + this.groupBox1.Controls.Add(this.textBox1); + this.groupBox1.Controls.Add(this.label1); + 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(25, 194); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(682, 81); + this.groupBox1.TabIndex = 1; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Wasserzähler 1"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(160, 31); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(163, 31); + this.textBox1.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(18, 34); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(74, 23); + this.label1.TabIndex = 0; + this.label1.Text = "Stand:"; + // + // 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(584, 29); + this.okButton.Name = "okButton"; + this.okButton.Size = new System.Drawing.Size(98, 63); + this.okButton.TabIndex = 7; + this.okButton.Text = "OK"; + this.okButton.UseVisualStyleBackColor = true; + this.okButton.Click += new System.EventHandler(this.okButton_Click); + // + // protocolGroupBox + // + this.protocolGroupBox.Controls.Add(this.radioButton4); + this.protocolGroupBox.Controls.Add(this.radioButton3); + this.protocolGroupBox.Controls.Add(this.radioButton2); + this.protocolGroupBox.Controls.Add(this.radioButton1); + this.protocolGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.protocolGroupBox.Location = new System.Drawing.Point(25, 13); + this.protocolGroupBox.Name = "protocolGroupBox"; + this.protocolGroupBox.Size = new System.Drawing.Size(362, 175); + this.protocolGroupBox.TabIndex = 0; + this.protocolGroupBox.TabStop = false; + this.protocolGroupBox.Text = "Protokoll"; + // + // radioButton3 + // + this.radioButton3.AutoSize = true; + this.radioButton3.Location = new System.Drawing.Point(34, 100); + this.radioButton3.Name = "radioButton3"; + this.radioButton3.Size = new System.Drawing.Size(152, 27); + this.radioButton3.TabIndex = 2; + this.radioButton3.TabStop = true; + this.radioButton3.Text = "radioButton3"; + this.radioButton3.UseVisualStyleBackColor = true; + this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged); + // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Location = new System.Drawing.Point(34, 67); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(152, 27); + this.radioButton2.TabIndex = 1; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "radioButton2"; + this.radioButton2.UseVisualStyleBackColor = true; + this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); + // + // radioButton1 + // + this.radioButton1.AutoSize = true; + this.radioButton1.Checked = true; + this.radioButton1.Location = new System.Drawing.Point(34, 34); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(152, 27); + this.radioButton1.TabIndex = 0; + this.radioButton1.TabStop = true; + this.radioButton1.Text = "radioButton1"; + this.radioButton1.UseVisualStyleBackColor = true; + this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.yearOfProduction3TextBox); + this.groupBox3.Controls.Add(this.yearOfProduction3Label); + this.groupBox3.Controls.Add(this.textBox3); + this.groupBox3.Controls.Add(this.label3); + 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(25, 374); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(682, 81); + this.groupBox3.TabIndex = 3; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Wasserzähler 3"; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(160, 31); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(163, 31); + this.textBox3.TabIndex = 1; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(18, 34); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(74, 23); + this.label3.TabIndex = 0; + this.label3.Text = "Stand:"; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.yearOfProduction4TextBox); + this.groupBox4.Controls.Add(this.yearOfProduction4Label); + this.groupBox4.Controls.Add(this.textBox4); + this.groupBox4.Controls.Add(this.label4); + this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.groupBox4.ForeColor = System.Drawing.Color.Black; + this.groupBox4.Location = new System.Drawing.Point(25, 464); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(682, 81); + this.groupBox4.TabIndex = 4; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "Wasserzähler 4"; + // + // textBox4 + // + this.textBox4.Location = new System.Drawing.Point(160, 31); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(163, 31); + this.textBox4.TabIndex = 1; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(18, 34); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(74, 23); + this.label4.TabIndex = 0; + this.label4.Text = "Stand:"; + // + // groupBox5 + // + this.groupBox5.Controls.Add(this.yearOfProduction5TextBox); + this.groupBox5.Controls.Add(this.yearOfProduction5Label); + this.groupBox5.Controls.Add(this.textBox5); + this.groupBox5.Controls.Add(this.label5); + this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.groupBox5.ForeColor = System.Drawing.Color.Black; + this.groupBox5.Location = new System.Drawing.Point(25, 554); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Size = new System.Drawing.Size(682, 81); + this.groupBox5.TabIndex = 5; + this.groupBox5.TabStop = false; + this.groupBox5.Text = "Wasserzähler 5"; + // + // textBox5 + // + this.textBox5.Location = new System.Drawing.Point(160, 31); + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(163, 31); + this.textBox5.TabIndex = 1; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(18, 34); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(74, 23); + this.label5.TabIndex = 0; + this.label5.Text = "Stand:"; + // + // groupBox6 + // + this.groupBox6.Controls.Add(this.yearOfProduction6TextBox); + this.groupBox6.Controls.Add(this.yearOfProduction6Label); + this.groupBox6.Controls.Add(this.textBox6); + this.groupBox6.Controls.Add(this.label6); + this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.groupBox6.ForeColor = System.Drawing.Color.Black; + this.groupBox6.Location = new System.Drawing.Point(25, 644); + this.groupBox6.Name = "groupBox6"; + this.groupBox6.Size = new System.Drawing.Size(682, 81); + this.groupBox6.TabIndex = 6; + this.groupBox6.TabStop = false; + this.groupBox6.Text = "Wasserzähler 6"; + // + // textBox6 + // + this.textBox6.Location = new System.Drawing.Point(160, 31); + this.textBox6.Name = "textBox6"; + this.textBox6.Size = new System.Drawing.Size(163, 31); + this.textBox6.TabIndex = 1; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(18, 34); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(74, 23); + this.label6.TabIndex = 0; + this.label6.Text = "Stand:"; + // + // radioButton4 + // + this.radioButton4.AutoSize = true; + this.radioButton4.Location = new System.Drawing.Point(34, 133); + this.radioButton4.Name = "radioButton4"; + this.radioButton4.Size = new System.Drawing.Size(152, 27); + this.radioButton4.TabIndex = 3; + this.radioButton4.TabStop = true; + this.radioButton4.Text = "radioButton4"; + this.radioButton4.UseVisualStyleBackColor = true; + this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged); + // + // yearOfProduction1Label + // + this.yearOfProduction1Label.AutoSize = true; + this.yearOfProduction1Label.Location = new System.Drawing.Point(351, 34); + this.yearOfProduction1Label.Name = "yearOfProduction1Label"; + this.yearOfProduction1Label.Size = new System.Drawing.Size(188, 23); + this.yearOfProduction1Label.TabIndex = 9; + this.yearOfProduction1Label.Text = "Year of production"; + // + // yearOfProduction2Label + // + this.yearOfProduction2Label.AutoSize = true; + this.yearOfProduction2Label.Location = new System.Drawing.Point(351, 34); + this.yearOfProduction2Label.Name = "yearOfProduction2Label"; + this.yearOfProduction2Label.Size = new System.Drawing.Size(188, 23); + this.yearOfProduction2Label.TabIndex = 10; + this.yearOfProduction2Label.Text = "Year of production"; + // + // yearOfProduction3Label + // + this.yearOfProduction3Label.AutoSize = true; + this.yearOfProduction3Label.Location = new System.Drawing.Point(351, 34); + this.yearOfProduction3Label.Name = "yearOfProduction3Label"; + this.yearOfProduction3Label.Size = new System.Drawing.Size(188, 23); + this.yearOfProduction3Label.TabIndex = 10; + this.yearOfProduction3Label.Text = "Year of production"; + // + // yearOfProduction4Label + // + this.yearOfProduction4Label.AutoSize = true; + this.yearOfProduction4Label.Location = new System.Drawing.Point(351, 34); + this.yearOfProduction4Label.Name = "yearOfProduction4Label"; + this.yearOfProduction4Label.Size = new System.Drawing.Size(188, 23); + this.yearOfProduction4Label.TabIndex = 10; + this.yearOfProduction4Label.Text = "Year of production"; + // + // yearOfProduction5Label + // + this.yearOfProduction5Label.AutoSize = true; + this.yearOfProduction5Label.Location = new System.Drawing.Point(351, 34); + this.yearOfProduction5Label.Name = "yearOfProduction5Label"; + this.yearOfProduction5Label.Size = new System.Drawing.Size(188, 23); + this.yearOfProduction5Label.TabIndex = 10; + this.yearOfProduction5Label.Text = "Year of production"; + // + // yearOfProduction6Label + // + this.yearOfProduction6Label.AutoSize = true; + this.yearOfProduction6Label.Location = new System.Drawing.Point(351, 34); + this.yearOfProduction6Label.Name = "yearOfProduction6Label"; + this.yearOfProduction6Label.Size = new System.Drawing.Size(188, 23); + this.yearOfProduction6Label.TabIndex = 10; + this.yearOfProduction6Label.Text = "Year of production"; + // + // yearOfProduction1TextBox + // + this.yearOfProduction1TextBox.Location = new System.Drawing.Point(559, 31); + this.yearOfProduction1TextBox.Name = "yearOfProduction1TextBox"; + this.yearOfProduction1TextBox.Size = new System.Drawing.Size(98, 31); + this.yearOfProduction1TextBox.TabIndex = 10; + // + // yearOfProduction2TextBox + // + this.yearOfProduction2TextBox.Location = new System.Drawing.Point(559, 31); + this.yearOfProduction2TextBox.Name = "yearOfProduction2TextBox"; + this.yearOfProduction2TextBox.Size = new System.Drawing.Size(98, 31); + this.yearOfProduction2TextBox.TabIndex = 11; + // + // yearOfProduction3TextBox + // + this.yearOfProduction3TextBox.Location = new System.Drawing.Point(559, 31); + this.yearOfProduction3TextBox.Name = "yearOfProduction3TextBox"; + this.yearOfProduction3TextBox.Size = new System.Drawing.Size(98, 31); + this.yearOfProduction3TextBox.TabIndex = 11; + // + // yearOfProduction4TextBox + // + this.yearOfProduction4TextBox.Location = new System.Drawing.Point(559, 31); + this.yearOfProduction4TextBox.Name = "yearOfProduction4TextBox"; + this.yearOfProduction4TextBox.Size = new System.Drawing.Size(98, 31); + this.yearOfProduction4TextBox.TabIndex = 11; + // + // yearOfProduction5TextBox + // + this.yearOfProduction5TextBox.Location = new System.Drawing.Point(559, 31); + this.yearOfProduction5TextBox.Name = "yearOfProduction5TextBox"; + this.yearOfProduction5TextBox.Size = new System.Drawing.Size(98, 31); + this.yearOfProduction5TextBox.TabIndex = 11; + // + // yearOfProduction6TextBox + // + this.yearOfProduction6TextBox.Location = new System.Drawing.Point(559, 31); + this.yearOfProduction6TextBox.Name = "yearOfProduction6TextBox"; + this.yearOfProduction6TextBox.Size = new System.Drawing.Size(98, 31); + this.yearOfProduction6TextBox.TabIndex = 11; + // + // CycleEndForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.DarkGoldenrod; + this.ClientSize = new System.Drawing.Size(719, 746); + this.Controls.Add(this.groupBox6); + this.Controls.Add(this.groupBox5); + this.Controls.Add(this.groupBox4); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.protocolGroupBox); + this.Controls.Add(this.okButton); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "CycleEndForm"; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.Text = "Daten"; + this.TopMost = true; + this.Load += new System.EventHandler(this.CycleEndForm_Load); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.protocolGroupBox.ResumeLayout(false); + this.protocolGroupBox.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.ResumeLayout(false); } @@ -359,6 +496,19 @@ namespace TBF.BenchControl.DataEntry.Munich3 private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.TextBox textBox6; private System.Windows.Forms.Label label6; + private System.Windows.Forms.RadioButton radioButton4; + private System.Windows.Forms.Label yearOfProduction1Label; + private System.Windows.Forms.TextBox yearOfProduction2TextBox; + private System.Windows.Forms.Label yearOfProduction2Label; + private System.Windows.Forms.TextBox yearOfProduction1TextBox; + private System.Windows.Forms.TextBox yearOfProduction3TextBox; + private System.Windows.Forms.Label yearOfProduction3Label; + private System.Windows.Forms.TextBox yearOfProduction4TextBox; + private System.Windows.Forms.Label yearOfProduction4Label; + private System.Windows.Forms.TextBox yearOfProduction5TextBox; + private System.Windows.Forms.Label yearOfProduction5Label; + private System.Windows.Forms.TextBox yearOfProduction6TextBox; + private System.Windows.Forms.Label yearOfProduction6Label; } } \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs index d63d85607..2b4694e4e 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs @@ -19,10 +19,12 @@ namespace TBF.BenchControl.DataEntry.Munich3 public string ProtocolName1; public string ProtocolName2; public string ProtocolName3; + public string ProtocolName4; // To be retrieved after the form closes public string ProtocolTitle; public string[] EndStateText; + public int[] YearOfProduction; // Set to 'true' when the form closes public bool Completed { get { return completed; } } @@ -37,6 +39,7 @@ namespace TBF.BenchControl.DataEntry.Munich3 this.WaterMetersCount = waterMetersCount; InitializeComponent(); EndStateText = new string[WaterMetersCount]; + YearOfProduction = new int[WaterMetersCount]; completed = false; StartForceCloseHandler(); } @@ -49,9 +52,12 @@ namespace TBF.BenchControl.DataEntry.Munich3 private void CycleEndForm_Load(object sender, EventArgs e) { - Localize(); + Localize(); - Height = 195 + 90 * WaterMetersCount; + radioButton1.Text = ProtocolName1; + radioButton2.Text = ProtocolName2; + radioButton3.Text = ProtocolName3; + radioButton4.Text = ProtocolName4; if (WaterMetersCount < 1) groupBox1.Visible = false; if (WaterMetersCount < 2) groupBox2.Visible = false; @@ -60,32 +66,64 @@ namespace TBF.BenchControl.DataEntry.Munich3 if (WaterMetersCount < 5) groupBox5.Visible = false; if (WaterMetersCount < 6) groupBox6.Visible = false; - radioButton1.Text = ProtocolName1; - radioButton2.Text = ProtocolName2; - radioButton3.Text = ProtocolName3; - } + if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 1) + { + yearOfProduction1TextBox.Text = Sequences.ProcessData.BatchRslts.WaterMeters[0].YearOfProduction.ToString(); + } + if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 2) + { + yearOfProduction2TextBox.Text = Sequences.ProcessData.BatchRslts.WaterMeters[1].YearOfProduction.ToString(); + } + if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 3) + { + yearOfProduction3TextBox.Text = Sequences.ProcessData.BatchRslts.WaterMeters[2].YearOfProduction.ToString(); + } + if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 4) + { + yearOfProduction4TextBox.Text = Sequences.ProcessData.BatchRslts.WaterMeters[3].YearOfProduction.ToString(); + } + if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 5) + { + yearOfProduction5TextBox.Text = Sequences.ProcessData.BatchRslts.WaterMeters[4].YearOfProduction.ToString(); + } + if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 6) + { + yearOfProduction6TextBox.Text = Sequences.ProcessData.BatchRslts.WaterMeters[5].YearOfProduction.ToString(); + } + + Height = 228 + 90 * WaterMetersCount; + + AnyRadioButtonChanged(); + } void Localize() { Text = Strings.Data; protocolGroupBox.Text = Strings.Protocol; + okButton.Text = Strings.OkBtnText; + 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.State; - label2.Text = Strings.State; - label3.Text = Strings.State; - label4.Text = Strings.State; - label5.Text = Strings.State; - label6.Text = Strings.State; - okButton.Text = Strings.OkBtnText; + + label1.Text = label2.Text = label3.Text = label4.Text + = label5.Text = label6.Text = Strings.State; + + yearOfProduction1Label.Text = yearOfProduction2Label.Text + = yearOfProduction3Label.Text = yearOfProduction4Label.Text + = yearOfProduction5Label.Text = yearOfProduction6Label.Text = Strings.Year_of_production; } private void okButton_Click(object sender, EventArgs e) { + if (radioButton1.Checked) ProtocolTitle = ProtocolName1; + else if (radioButton2.Checked) ProtocolTitle = ProtocolName2; + else if (radioButton3.Checked) ProtocolTitle = ProtocolName3; + else if (radioButton4.Checked) ProtocolTitle = ProtocolName4; + if (WaterMetersCount >= 1) EndStateText[0] = textBox1.Text; if (WaterMetersCount >= 2) EndStateText[1] = textBox2.Text; if (WaterMetersCount >= 3) EndStateText[2] = textBox3.Text; @@ -93,9 +131,16 @@ namespace TBF.BenchControl.DataEntry.Munich3 if (WaterMetersCount >= 5) EndStateText[4] = textBox5.Text; if (WaterMetersCount >= 6) EndStateText[5] = textBox6.Text; - if (radioButton1.Checked) ProtocolTitle = ProtocolName1; - else if (radioButton2.Checked) ProtocolTitle = ProtocolName2; - else if (radioButton3.Checked) ProtocolTitle = ProtocolName3; + if ((radioButton3.Checked || radioButton4.Checked)) + { + int year; + if (WaterMetersCount >= 1 && int.TryParse(yearOfProduction1TextBox.Text, out year)) YearOfProduction[0] = year; + if (WaterMetersCount >= 2 && int.TryParse(yearOfProduction2TextBox.Text, out year)) YearOfProduction[1] = year; + if (WaterMetersCount >= 3 && int.TryParse(yearOfProduction3TextBox.Text, out year)) YearOfProduction[2] = year; + if (WaterMetersCount >= 4 && int.TryParse(yearOfProduction4TextBox.Text, out year)) YearOfProduction[3] = year; + if (WaterMetersCount >= 5 && int.TryParse(yearOfProduction5TextBox.Text, out year)) YearOfProduction[4] = year; + if (WaterMetersCount >= 6 && int.TryParse(yearOfProduction6TextBox.Text, out year)) YearOfProduction[5] = year; + } completed = true; Close(); @@ -119,5 +164,28 @@ namespace TBF.BenchControl.DataEntry.Munich3 } #endregion - } + + private void radioButton1_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } + private void radioButton2_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } + private void radioButton3_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } + private void radioButton4_CheckedChanged(object sender, EventArgs e) { AnyRadioButtonChanged(); } + + void AnyRadioButtonChanged() + { + if (radioButton3.Checked || radioButton4.Checked) + { + yearOfProduction1TextBox.Visible = yearOfProduction2TextBox.Visible = yearOfProduction3TextBox.Visible = true; + yearOfProduction4TextBox.Visible = yearOfProduction5TextBox.Visible = yearOfProduction6TextBox.Visible = true; + yearOfProduction1Label.Visible = yearOfProduction2Label.Visible = yearOfProduction3Label.Visible = true; + yearOfProduction4Label.Visible = yearOfProduction5Label.Visible = yearOfProduction6Label.Visible = true; + } + else + { + yearOfProduction1TextBox.Visible = yearOfProduction2TextBox.Visible = yearOfProduction3TextBox.Visible = false; + yearOfProduction4TextBox.Visible = yearOfProduction5TextBox.Visible = yearOfProduction6TextBox.Visible = false; + yearOfProduction1Label.Visible = yearOfProduction2Label.Visible = yearOfProduction3Label.Visible = false; + yearOfProduction4Label.Visible = yearOfProduction5Label.Visible = yearOfProduction6Label.Visible = false; + } + } + } } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs index 701d24f16..98efb3213 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs @@ -163,7 +163,8 @@ namespace TBF.BenchControl.DataEntry.Munich3 if (waterMeters[i] != null) { wmEndState[i] = waterMeters[i].EndState = dlg.EndStateText[i]; - } + waterMeters[i].YearOfProduction = dlg.YearOfProduction[i]; + } } } resultSaved = true; diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index 299c41a52..c8bab0d9d 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -3735,6 +3735,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Year of production. + /// + internal static string Year_of_production { + get { + return ResourceManager.GetString("Year_of_production", resourceCulture); + } + } + /// /// Looks up a localized string similar to yes. /// diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 937397e07..06c02021e 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -1137,4 +1137,10 @@ Wasserzähler {0} + + Nach diesem Prüfpunkt weiterhin die Prüfung + + + Eichjahr + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 744ee0eb3..828afa891 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1351,4 +1351,7 @@ Water Meter {0} + + Year of production + \ No newline at end of file