michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PurchaseOrder handling in database and entry forms. DB table TestResult changed.

Browse Source 
IHasCycleBeginForm and IHasCycleEndForm changed, values now available directly from forms, not only from Watermeters.
This commit is contained in:
Milan Hanajik 2015-03-26 05:53:15 +01:00
parent c85b65c2e1
commit 0323efe57c
12 changed files with 315 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.txt
View File

@ -1,3 +1,5 @@
- historia ordrov (cez settingy)
- dokoncenie process obrazovky
- brat desatinnu bodku aj ciarku
- dat zapamatanie polohy RV do Parametrov

34
TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs
View File

@ -6,7 +6,7 @@ using TBF.BenchControl.GenericDevices;
namespace TBF.BenchControl.DataEntry.Combined
{
public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasProtocolTitle
public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm
{
private static readonly ILog log = LogManager.GetLogger(typeof(EntryForm));
public override string ToString() { return string.Format("DataEntry.Combined({0})", Cfg.ToString(1)); }
@ -16,14 +16,24 @@ namespace TBF.BenchControl.DataEntry.Combined
/// <summary>
/// Properties set by the Begin and the End form
/// </summary>
public string ProtocolTitle { get { return protocolTitle; } }
string protocolTitle;
string purchaseOrder;
public string PurchaseOrder { get { return purchaseOrder; } }
/// <summary> Not supported in Munich </summary>
public string SerialNr(int wmNr) { return string.Empty; }
string[] serialNr;
public string SerialNr(int wmNr) { return (wmNr >= 0 && wmNr < serialNr.Length) ? serialNr[wmNr] : string.Empty; }
/// <summary> Not supported in Munich </summary>
public float WMState(int wmNr) { return 0; }
bool[] disabled;
public bool Disabled(int wmNr) { return (wmNr >= 0 && wmNr < disabled.Length) ? disabled[wmNr] : false; }
string[] wmEndState;
public string WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : string.Empty; }
public float WMState(int wmNr)
{
float retVal;
if (wmNr >= 0 && wmNr < wmEndState.Length && Utils.TryParseUFloat(wmEndState[wmNr], out retVal)) return retVal;
return 0;
}
System.Windows.Forms.Form modelessDlg;
@ -45,7 +55,11 @@ namespace TBF.BenchControl.DataEntry.Combined
public EntryForm(EntryFormCfg cfg)
: base(cfg)
{
entryFormCfg = cfg;
serialNr = new string[Program.WMsCount];
disabled = new bool[Program.WMsCount];
wmEndState = new string[Program.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
@ -91,9 +105,6 @@ namespace TBF.BenchControl.DataEntry.Combined
void OpenEndDlg(EntryForm myRef)
{
CycleEndForm endForm = new CycleEndForm();
endForm.ProtocolName1 = entryFormCfg.ProtocolTitle1;
endForm.ProtocolName2 = entryFormCfg.ProtocolTitle2;
endForm.ProtocolName3 = entryFormCfg.ProtocolTitle3;
myRef.modelessDlg = endForm;
modelessDlg.Show();
}
@ -141,7 +152,6 @@ namespace TBF.BenchControl.DataEntry.Combined
if (wMeters.Count >= 4 && wMeters[3] != null) wMeters[3].EndState = (modelessDlg as CycleEndForm).AuxStateText[1];
if (wMeters.Count >= 6 && wMeters[4] != null) wMeters[4].EndState = (modelessDlg as CycleEndForm).MainStateText[2];
if (wMeters.Count >= 6 && wMeters[5] != null) wMeters[5].EndState = (modelessDlg as CycleEndForm).AuxStateText[2];
protocolTitle = (modelessDlg as CycleEndForm).ProtocolTitle;
}
resultSaved = true;
modelessDlg = null;

26
TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs
View File

@ -16,14 +16,25 @@ namespace TBF.BenchControl.DataEntry.Munich
/// <summary>
/// Properties set by the Begin and the End form
/// </summary>
public string ProtocolTitle { get { return protocolTitle; } }
public string ProtocolTitle { get { return protocolTitle; } } /// Only supported in Munich
string protocolTitle;
/// <summary> Not supported in Munich </summary>
public string SerialNr(int wmNr) { return string.Empty; }
public string PurchaseOrder { get { return string.Empty; } } /// Not supported in Munich
/// <summary> Not supported in Munich </summary>
public float WMState(int wmNr) { return 0; }
string[] serialNr;
public string SerialNr(int wmNr) { return (wmNr >= 0 && wmNr < serialNr.Length) ? serialNr[wmNr] : string.Empty; }
public bool Disabled(int wmNr) { return false; } /// Not supported in Munich
string[] wmEndState;
public string WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : string.Empty; }
public float WMState(int wmNr)
{
float retVal;
if (wmNr >= 0 && wmNr < wmEndState.Length && Utils.TryParseUFloat(wmEndState[wmNr], out retVal)) return retVal;
return 0;
}
System.Windows.Forms.Form modelessDlg;
@ -45,7 +56,10 @@ namespace TBF.BenchControl.DataEntry.Munich
public EntryForm(EntryFormCfg cfg)
: base(cfg)
{
entryFormCfg = cfg;
serialNr = new string[Program.WMsCount];
wmEndState = new string[Program.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}

55
TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
View File

@ -16,14 +16,25 @@ namespace TBF.BenchControl.DataEntry.Munich3
/// <summary>
/// Properties set by the Begin and the End form
/// </summary>
public string ProtocolTitle { get { return protocolTitle; } }
public string ProtocolTitle { get { return protocolTitle; } } /// Only supported in Munich
string protocolTitle;
/// <summary> Not supported in Munich </summary>
public string SerialNr(int wmNr) { return string.Empty; }
public string PurchaseOrder { get { return string.Empty; } } /// Not supported in Munich
/// <summary> Not supported in Munich </summary>
public float WMState(int wmNr) { return 0; }
string[] serialNr;
public string SerialNr(int wmNr) { return (wmNr >= 0 && wmNr < serialNr.Length) ? serialNr[wmNr] : string.Empty; }
public bool Disabled(int wmNr) { return false; } /// Not supported in Munich
string[] wmEndState;
public string WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : string.Empty; }
public float WMState(int wmNr)
{
float retVal;
if (wmNr >= 0 && wmNr < wmEndState.Length && Utils.TryParseUFloat(wmEndState[wmNr], out retVal)) return retVal;
return 0;
}
System.Windows.Forms.Form modelessDlg;
@ -45,7 +56,10 @@ namespace TBF.BenchControl.DataEntry.Munich3
public EntryForm(EntryFormCfg cfg)
: base(cfg)
{
entryFormCfg = cfg;
serialNr = new string[Program.WMsCount];
wmEndState = new string[Program.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
@ -127,27 +141,28 @@ namespace TBF.BenchControl.DataEntry.Munich3
if (modelessDlg is CycleBeginningForm)
{
CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
int count = Math.Min(dlg.WaterMetersCount, waterMeters.Count);
if (count > 0 && waterMeters[0] != null) waterMeters[0].SerialNr = dlg.SNText[0];
if (count > 1 && waterMeters[1] != null) waterMeters[1].SerialNr = dlg.SNText[1];
if (count > 2 && waterMeters[2] != null) waterMeters[2].SerialNr = dlg.SNText[2];
if (count > 3 && waterMeters[3] != null) waterMeters[3].SerialNr = dlg.SNText[3];
if (count > 4 && waterMeters[4] != null) waterMeters[4].SerialNr = dlg.SNText[4];
if (count > 5 && waterMeters[5] != null) waterMeters[5].SerialNr = dlg.SNText[5];
for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++)
{
if (waterMeters[i] != null)
{
serialNr[i] = waterMeters[i].SerialNr = dlg.SNText[i];
}
}
}
else if (modelessDlg is CycleEndForm)
{
CycleEndForm dlg = (modelessDlg as CycleEndForm);
int count = Math.Min(dlg.WaterMetersCount, waterMeters.Count);
protocolTitle = dlg.ProtocolTitle;
if (count > 0 && waterMeters[0] != null) waterMeters[0].EndState = dlg.EndStateText[0];
if (count > 1 && waterMeters[1] != null) waterMeters[1].EndState = dlg.EndStateText[1];
if (count > 2 && waterMeters[2] != null) waterMeters[2].EndState = dlg.EndStateText[2];
if (count > 3 && waterMeters[3] != null) waterMeters[3].EndState = dlg.EndStateText[3];
if (count > 4 && waterMeters[4] != null) waterMeters[4].EndState = dlg.EndStateText[4];
if (count > 5 && waterMeters[5] != null) waterMeters[5].EndState = dlg.EndStateText[5];
for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++)
{
if (waterMeters[i] != null)
{
wmEndState[i] = waterMeters[i].EndState = dlg.EndStateText[i];
}
}
}
resultSaved = true;
modelessDlg = null;

21
TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.Designer.cs generated
View File

@ -55,12 +55,15 @@
this.checkBox6 = new System.Windows.Forms.CheckBox();
this.textBox6 = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.orderGroupBox = new System.Windows.Forms.GroupBox();
this.orderComboBox = new System.Windows.Forms.ComboBox();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
this.orderGroupBox.SuspendLayout();
this.SuspendLayout();
//
// okButton
@ -240,11 +243,26 @@
resources.ApplyResources(this.label6, "label6");
this.label6.Name = "label6";
//
// orderGroupBox
//
this.orderGroupBox.Controls.Add(this.orderComboBox);
resources.ApplyResources(this.orderGroupBox, "orderGroupBox");
this.orderGroupBox.ForeColor = System.Drawing.Color.Black;
this.orderGroupBox.Name = "orderGroupBox";
this.orderGroupBox.TabStop = false;
//
// orderComboBox
//
this.orderComboBox.FormattingEnabled = true;
resources.ApplyResources(this.orderComboBox, "orderComboBox");
this.orderComboBox.Name = "orderComboBox";
//
// CycleBeginningForm
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.Controls.Add(this.orderGroupBox);
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox4);
@ -269,6 +287,7 @@
this.groupBox5.PerformLayout();
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.orderGroupBox.ResumeLayout(false);
this.ResumeLayout(false);
}
@ -301,5 +320,7 @@
private System.Windows.Forms.CheckBox checkBox4;
private System.Windows.Forms.CheckBox checkBox5;
private System.Windows.Forms.CheckBox checkBox6;
private System.Windows.Forms.GroupBox orderGroupBox;
private System.Windows.Forms.ComboBox orderComboBox;
}
}

4
TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs
View File

@ -13,6 +13,7 @@ namespace TBF.BenchControl.DataEntry.Standard
public readonly int WaterMetersCount;
/// To be retrieved after the form is closed
public string PurchaseOrder;
public string[] SNText;
public bool[] Disabled;
@ -33,7 +34,7 @@ namespace TBF.BenchControl.DataEntry.Standard
completed = false;
StartForceCloseHandler();
//Height = 55 + WaterMetersCount * 105;
Height = 147 + WaterMetersCount * 90;
}
/// <summary> Parameterless constructor for 3 watermeters </summary>
@ -74,6 +75,7 @@ namespace TBF.BenchControl.DataEntry.Standard
private void okButton_Click(object sender, EventArgs e)
{
PurchaseOrder = orderComboBox.Text;
if (WaterMetersCount >= 1) { SNText[0] = textBox1.Text; Disabled[0] = !checkBox1.Checked; }
if (WaterMetersCount >= 2) { SNText[1] = textBox2.Text; Disabled[1] = !checkBox2.Checked; }
if (WaterMetersCount >= 3) { SNText[2] = textBox3.Text; Disabled[2] = !checkBox3.Checked; }

198
TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.resx
View File

@ -122,14 +122,14 @@
<value>Verdana, 14.25pt</value>
</data>
<data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
<value>506, 38</value>
<value>506, 26</value>
</data>
<data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
<value>98, 63</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="okButton.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<value>7</value>
</data>
<data name="okButton.Text" xml:space="preserve">
<value>OK</value>
@ -144,7 +144,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="&gt;&gt;checkBox1.Name" xml:space="preserve">
<value>checkBox1</value>
@ -186,10 +186,10 @@
<value>Verdana, 14.25pt</value>
</data>
<data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 18</value>
<value>28, 110</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>444, 92</value>
<value>444, 77</value>
</data>
<data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -207,7 +207,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="checkBox1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -216,7 +216,7 @@
<value>Verdana, 27.75pt</value>
</data>
<data name="checkBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>391, 48</value>
<value>391, 40</value>
</data>
<data name="checkBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -237,7 +237,7 @@
<value>0</value>
</data>
<data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>187, 37</value>
<value>187, 29</value>
</data>
<data name="textBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 31</value>
@ -261,7 +261,7 @@
<value>True</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 40</value>
<value>18, 32</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>156, 23</value>
@ -324,10 +324,10 @@
<value>Verdana, 14.25pt</value>
</data>
<data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 123</value>
<value>28, 200</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>444, 92</value>
<value>444, 77</value>
</data>
<data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -345,7 +345,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="checkBox2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -358,7 +358,7 @@
<value>NoControl</value>
</data>
<data name="checkBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>391, 48</value>
<value>391, 40</value>
</data>
<data name="checkBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -379,7 +379,7 @@
<value>0</value>
</data>
<data name="textBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>187, 37</value>
<value>187, 29</value>
</data>
<data name="textBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 31</value>
@ -403,7 +403,7 @@
<value>True</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 40</value>
<value>18, 32</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>156, 23</value>
@ -478,10 +478,10 @@
<value>Verdana, 14.25pt</value>
</data>
<data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 228</value>
<value>28, 290</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>444, 92</value>
<value>444, 77</value>
</data>
<data name="groupBox3.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -499,7 +499,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;groupBox3.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="checkBox7.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -541,7 +541,7 @@
<value>NoControl</value>
</data>
<data name="checkBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>391, 48</value>
<value>391, 40</value>
</data>
<data name="checkBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -562,7 +562,7 @@
<value>1</value>
</data>
<data name="textBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>187, 37</value>
<value>187, 29</value>
</data>
<data name="textBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 31</value>
@ -589,7 +589,7 @@
<value>NoControl</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 40</value>
<value>18, 32</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>156, 23</value>
@ -652,10 +652,10 @@
<value>Verdana, 14.25pt</value>
</data>
<data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 333</value>
<value>28, 380</value>
</data>
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>444, 92</value>
<value>444, 77</value>
</data>
<data name="groupBox4.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -673,7 +673,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;groupBox4.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="checkBox4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -685,7 +685,7 @@
<value>NoControl</value>
</data>
<data name="checkBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>391, 48</value>
<value>391, 40</value>
</data>
<data name="checkBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -706,7 +706,7 @@
<value>0</value>
</data>
<data name="textBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>187, 37</value>
<value>187, 29</value>
</data>
<data name="textBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 31</value>
@ -730,7 +730,7 @@
<value>True</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 40</value>
<value>18, 32</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>156, 23</value>
@ -793,10 +793,10 @@
<value>Verdana, 14.25pt</value>
</data>
<data name="groupBox5.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 438</value>
<value>28, 470</value>
</data>
<data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>444, 92</value>
<value>444, 77</value>
</data>
<data name="groupBox5.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -814,7 +814,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;groupBox5.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="checkBox5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -826,7 +826,7 @@
<value>NoControl</value>
</data>
<data name="checkBox5.Location" type="System.Drawing.Point, System.Drawing">
<value>391, 48</value>
<value>391, 40</value>
</data>
<data name="checkBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -847,7 +847,7 @@
<value>0</value>
</data>
<data name="textBox5.Location" type="System.Drawing.Point, System.Drawing">
<value>187, 37</value>
<value>187, 29</value>
</data>
<data name="textBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 31</value>
@ -871,7 +871,7 @@
<value>True</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 40</value>
<value>18, 32</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
<value>156, 23</value>
@ -894,6 +894,69 @@
<data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;checkBox6.Name" xml:space="preserve">
<value>checkBox6</value>
</data>
<data name="&gt;&gt;checkBox6.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;checkBox6.Parent" xml:space="preserve">
<value>groupBox6</value>
</data>
<data name="&gt;&gt;checkBox6.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;textBox6.Name" xml:space="preserve">
<value>textBox6</value>
</data>
<data name="&gt;&gt;textBox6.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox6.Parent" xml:space="preserve">
<value>groupBox6</value>
</data>
<data name="&gt;&gt;textBox6.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;label6.Name" xml:space="preserve">
<value>label6</value>
</data>
<data name="&gt;&gt;label6.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label6.Parent" xml:space="preserve">
<value>groupBox6</value>
</data>
<data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="groupBox6.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
</data>
<data name="groupBox6.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 560</value>
</data>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>444, 77</value>
</data>
<data name="groupBox6.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Watermeter 6</value>
</data>
<data name="&gt;&gt;groupBox6.Name" xml:space="preserve">
<value>groupBox6</value>
</data>
<data name="&gt;&gt;groupBox6.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;groupBox6.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;groupBox6.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="checkBox6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -904,7 +967,7 @@
<value>NoControl</value>
</data>
<data name="checkBox6.Location" type="System.Drawing.Point, System.Drawing">
<value>391, 48</value>
<value>391, 40</value>
</data>
<data name="checkBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
@ -925,7 +988,7 @@
<value>0</value>
</data>
<data name="textBox6.Location" type="System.Drawing.Point, System.Drawing">
<value>187, 37</value>
<value>187, 29</value>
</data>
<data name="textBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 31</value>
@ -949,7 +1012,7 @@
<value>True</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 40</value>
<value>18, 32</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>156, 23</value>
@ -972,31 +1035,64 @@
<data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="groupBox6.Font" type="System.Drawing.Font, System.Drawing">
<data name="&gt;&gt;orderComboBox.Name" xml:space="preserve">
<value>orderComboBox</value>
</data>
<data name="&gt;&gt;orderComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;orderComboBox.Parent" xml:space="preserve">
<value>orderGroupBox</value>
</data>
<data name="&gt;&gt;orderComboBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="orderGroupBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
</data>
<data name="groupBox6.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 543</value>
<data name="orderGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 12</value>
</data>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>444, 92</value>
<data name="orderGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>444, 82</value>
</data>
<data name="groupBox6.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<data name="orderGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Watermeter 6</value>
<data name="orderGroupBox.Text" xml:space="preserve">
<value>Order</value>
</data>
<data name="&gt;&gt;groupBox6.Name" xml:space="preserve">
<value>groupBox6</value>
<data name="&gt;&gt;orderGroupBox.Name" xml:space="preserve">
<value>orderGroupBox</value>
</data>
<data name="&gt;&gt;groupBox6.Type" xml:space="preserve">
<data name="&gt;&gt;orderGroupBox.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;groupBox6.Parent" xml:space="preserve">
<data name="&gt;&gt;orderGroupBox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;groupBox6.ZOrder" xml:space="preserve">
<data name="&gt;&gt;orderGroupBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="orderComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>90, 31</value>
</data>
<data name="orderComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>260, 31</value>
</data>
<data name="orderComboBox.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;orderComboBox.Name" xml:space="preserve">
<value>orderComboBox</value>
</data>
<data name="&gt;&gt;orderComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;orderComboBox.Parent" xml:space="preserve">
<value>orderGroupBox</value>
</data>
<data name="&gt;&gt;orderComboBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@ -1012,7 +1108,7 @@
<value>636, 656</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Daten</value>
<value>Batch data</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>CycleBeginningForm</value>

57
TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
View File

@ -16,8 +16,24 @@ namespace TBF.BenchControl.DataEntry.Standard
/// <summary>
/// Properties set by the Begin and the End form
/// </summary>
public string SerialNr(int wmNr) { return string.Empty; }
public float WMState(int wmNr) { return 0; }
string purchaseOrder;
public string PurchaseOrder { get { return purchaseOrder; } }
string[] serialNr;
public string SerialNr(int wmNr) { return (wmNr >= 0 && wmNr < serialNr.Length) ? serialNr[wmNr] : string.Empty; }
bool[] disabled;
public bool Disabled(int wmNr) { return (wmNr >= 0 && wmNr < disabled.Length) ? disabled[wmNr] : false; }
string[] wmEndState;
public string WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : string.Empty; }
public float WMState(int wmNr)
{
float retVal;
if (wmNr >= 0 && wmNr < wmEndState.Length && Utils.TryParseUFloat(wmEndState[wmNr], out retVal)) return retVal;
return 0;
}
System.Windows.Forms.Form modelessDlg;
@ -39,7 +55,11 @@ namespace TBF.BenchControl.DataEntry.Standard
public EntryForm(EntryFormCfg cfg)
: base(cfg)
{
entryFormCfg = cfg;
serialNr = new string[Program.WMsCount];
disabled = new bool[Program.WMsCount];
wmEndState = new string[Program.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
@ -117,26 +137,29 @@ namespace TBF.BenchControl.DataEntry.Standard
if (modelessDlg is CycleBeginningForm)
{
CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
int count = Math.Min(dlg.WaterMetersCount, waterMeters.Count);
if (count > 0 && waterMeters[0] != null) { waterMeters[0].SerialNr = dlg.SNText[0]; waterMeters[0].Disabled = dlg.Disabled[0]; }
if (count > 1 && waterMeters[1] != null) { waterMeters[1].SerialNr = dlg.SNText[1]; waterMeters[1].Disabled = dlg.Disabled[1]; }
if (count > 2 && waterMeters[2] != null) { waterMeters[2].SerialNr = dlg.SNText[2]; waterMeters[2].Disabled = dlg.Disabled[2]; }
if (count > 3 && waterMeters[3] != null) { waterMeters[3].SerialNr = dlg.SNText[3]; waterMeters[3].Disabled = dlg.Disabled[3]; }
if (count > 4 && waterMeters[4] != null) { waterMeters[4].SerialNr = dlg.SNText[4]; waterMeters[4].Disabled = dlg.Disabled[4]; }
if (count > 5 && waterMeters[5] != null) { waterMeters[5].SerialNr = dlg.SNText[5]; waterMeters[5].Disabled = dlg.Disabled[5]; }
purchaseOrder = dlg.PurchaseOrder;
for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++)
{
if (waterMeters[i] != null)
{
serialNr[i] = waterMeters[i].SerialNr = dlg.SNText[i];
disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
}
}
}
else if (modelessDlg is CycleEndForm)
{
CycleEndForm dlg = (modelessDlg as CycleEndForm);
int count = Math.Min(dlg.WaterMetersCount, waterMeters.Count);
if (count > 0 && waterMeters[0] != null) waterMeters[0].EndState = dlg.EndStateText[0];
if (count > 1 && waterMeters[1] != null) waterMeters[1].EndState = dlg.EndStateText[1];
if (count > 2 && waterMeters[2] != null) waterMeters[2].EndState = dlg.EndStateText[2];
if (count > 3 && waterMeters[3] != null) waterMeters[3].EndState = dlg.EndStateText[3];
if (count > 4 && waterMeters[4] != null) waterMeters[4].EndState = dlg.EndStateText[4];
if (count > 5 && waterMeters[5] != null) waterMeters[5].EndState = dlg.EndStateText[5];
for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++)
{
if (waterMeters[i] != null)
{
wmEndState[i] = waterMeters[i].EndState = dlg.EndStateText[i];
}
}
}
resultSaved = true;
modelessDlg = null;

15
TestBenchFramework/BenchControl/GenericDevices/IHasCycleBeginForm.cs
View File

@ -4,6 +4,21 @@ namespace TBF.BenchControl.GenericDevices
{
public interface IHasCycleBeginForm
{
/// <summary>
/// Purchase order selected/typed in the cycle beginning form
/// </summary>
string PurchaseOrder { get; }
/// <summary>
/// Water meter serial numbers typed in the cycle beginning form
/// </summary>
string SerialNr(int wmNr);
/// <summary>
/// Water meter not present/disregarded information (default = false = present)
/// </summary>
bool Disabled(int wmNr);
/// <summary>
/// Displays form at the beginning of the cycle (usually to enter S/N).
/// </summary>

7
TestBenchFramework/BenchControl/GenericDevices/IHasCycleEndForm.cs
View File

@ -4,7 +4,12 @@ namespace TBF.BenchControl.GenericDevices
{
public interface IHasCycleEndForm
{
/// <summary>
/// <summary>
/// Water meter states typed in the cycle end form
/// </summary>
string WMEndState(int wmNr);
/// <summary>
/// Displays form at the end of the cycle (usually to enter the end state).
/// </summary>
/// <param name="waterMeters">Watermetes to be updated by the operation</param>

1
TestBenchFramework/Entities/TestResult.cs
View File

@ -8,6 +8,7 @@ namespace TBF.Entities
public virtual int Id { get; protected set; }
public virtual string Name { get; set; }
public virtual int BatchNr { get; set; }
public virtual string PurchaseOrder { get; set; }
public virtual MetersKind MetersKind { get; set; }
public virtual IList<MeterTestResult> Meters { get; set; }
public virtual IList<MeterTestResult> CombinedMeters { get; set; }

6
TestBenchFramework/Mappings/TestResultMap.cs
View File

@ -9,9 +9,9 @@ namespace TBF.Mappings
{
Id(x => x.Id);
Map(x => x.Name);
Map(x => x.BatchNr)
.Column("CycleNr");
Map(x => x.MetersKind);
Map(x => x.BatchNr);
Map(x => x.PurchaseOrder);
Map(x => x.MetersKind);
HasMany(x => x.Meters)
.Cascade.All();
HasMany(x => x.CombinedMeters)