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

DataEntry.Standard12 modified, Results.Entities modified (WaterMeter.ResultCode, Batch.Remark), DB changed, ver.2.8.308

Browse Source
This commit is contained in:
Milan Hanajik 2016-06-17 15:59:32 +02:00
parent 0c3ed1e1bf
commit b909c82b28
25 changed files with 448 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Config/Data.cs
View File

@ -36,6 +36,14 @@ namespace Config
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
#elif SLM_PT50
public const int WMsCount = 12;
public const int LineSize = 12;
public const int CompoundWMsCount = 1;
#elif SLM_END
public const int WMsCount = 12;
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
#endif
public static int MaxPartNr()
{

4
Config/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.7.303.0")]
[assembly: AssemblyFileVersion("2.7.303.0")]
[assembly: AssemblyVersion("2.8.308.0")]
[assembly: AssemblyFileVersion("2.8.308.0")]

1
Results/Entities/Batch.cs
View File

@ -19,6 +19,7 @@ namespace Results.Entities
public virtual int ProcedureRevision { get; set; }
public virtual string WatermetersStr { get; set; } /// CEVAK, not mapped to DB
public virtual string ProtocolTitle { get; set; }
public virtual string Remark { get; set; }
public virtual float Custom1 { get; set; }
public virtual float Custom2 { get; set; }
public virtual float Custom3 { get; set; }

2
Results/Entities/WaterMeter.cs
View File

@ -19,6 +19,8 @@ namespace Results.Entities
public virtual double QRise { get; set; } ///![m3/h] detected Q_rise of a composed meter
public virtual double QFall { get; set; } ///![m3/h] detected Q_fall of a composed meter
public virtual bool Passed { get; set; }
public virtual int ResultCode { get; set; }
#if IPERLST || IPERLST_SPECIAL
public virtual int SerialNrEx { get; set; } /// Aux s/n for compound meters, Serial number for iPerl water meter
public virtual double OrigCalibFactor { get; set; } /// iPerl calibration factor used during the test

3
Results/Mappings/BatchMap.cs
View File

@ -19,6 +19,9 @@ namespace Results.Mappings
Map(x => x.ProcedureName);
Map(x => x.ProcedureRevision);
Map(x => x.ProtocolTitle);
Map(x => x.Remark)
.CustomType("StringClob")
.CustomSqlType("varchar(2000)");
Map(x => x.Custom1);
Map(x => x.Custom2);
Map(x => x.Custom3);

2
Results/Mappings/WaterMeterMap.cs
View File

@ -21,6 +21,8 @@ namespace Results.Mappings
Map(x => x.QRise);
Map(x => x.QFall);
Map(x => x.Passed);
Map(x => x.ResultCode);
#if IPERLST || IPERLST_SPECIAL
Map(x => x.SerialNrEx);
Map(x => x.OrigCalibFactor);

4
Results/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.7.307.0")]
[assembly: AssemblyFileVersion("2.7.307.0")]
[assembly: AssemblyVersion("2.8.308.0")]
[assembly: AssemblyFileVersion("2.8.308.0")]

18
Results/Resources/Strings.Designer.cs generated
View File

@ -555,6 +555,15 @@ namespace Results.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Remark.
/// </summary>
internal static string Remark {
get {
return ResourceManager.GetString("Remark", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &lt; Remove.
/// </summary>
@ -582,6 +591,15 @@ namespace Results.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Result code.
/// </summary>
internal static string Result_code {
get {
return ResourceManager.GetString("Result_code", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Results.
/// </summary>

6
Results/Resources/Strings.cs.resx
View File

@ -150,6 +150,9 @@
<data name="Precision" xml:space="preserve">
<value>Přesnost</value>
</data>
<data name="Remark" xml:space="preserve">
<value>Poznámka</value>
</data>
<data name="Remove" xml:space="preserve">
<value>&lt; Odebrat</value>
</data>
@ -162,6 +165,9 @@
<data name="Results" xml:space="preserve">
<value>Výsledky</value>
</data>
<data name="Result_code" xml:space="preserve">
<value>Kód výsledku</value>
</data>
<data name="Selected_results" xml:space="preserve">
<value>Vybrané výsledky</value>
</data>

6
Results/Resources/Strings.de.resx
View File

@ -375,4 +375,10 @@
<data name="Results" xml:space="preserve">
<value>Ergebnisse</value>
</data>
<data name="Remark" xml:space="preserve">
<value>Bemerkung</value>
</data>
<data name="Result_code" xml:space="preserve">
<value>Ergebniscode</value>
</data>
</root>

6
Results/Resources/Strings.resx
View File

@ -378,4 +378,10 @@
<data name="Results" xml:space="preserve">
<value>Results</value>
</data>
<data name="Remark" xml:space="preserve">
<value>Remark</value>
</data>
<data name="Result_code" xml:space="preserve">
<value>Result code</value>
</data>
</root>

3
Results/WMeterRsltItemSpec.cs
View File

@ -215,6 +215,9 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(72, "Batch end time", Strings.End, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.Batch.EndTime.ToString() : string.Format(f, w.Batch.EndTime)));
AllItems.Add(new WMeterRsltItemSpec(73, null, "1 / PlsPerLtr_Read", (w, t, u, f, p) => string.IsNullOrEmpty(p) ? ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString()
: ((w.WaterMeterData.PulsesPerLtr != 0) ? 1 / w.WaterMeterData.PulsesPerLtr : 0).ToString(p)));
/// Extra water meter data
AllItems.Add(new WMeterRsltItemSpec(74, null, Strings.Result_code, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? w.ResultCode.ToString() : string.Format(f, w.ResultCode)));
AllItems.Add(new WMeterRsltItemSpec(75, null, Strings.Remark, (w, t, u, f, p) => w.Batch.Remark));
}
/// <summary>

64
TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs generated
View File

@ -81,6 +81,14 @@ namespace TBF.BenchControl.DataEntry.Standard12
this.ext2TextBox = new System.Windows.Forms.TextBox();
this.ext1Label = new System.Windows.Forms.Label();
this.ext1TextBox = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.textBox3 = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.remarkTextBox = new System.Windows.Forms.TextBox();
this.label16 = new System.Windows.Forms.Label();
this.orderGroupBox.SuspendLayout();
this.extensionsGroupBox.SuspendLayout();
this.SuspendLayout();
@ -357,6 +365,14 @@ namespace TBF.BenchControl.DataEntry.Standard12
//
// extensionsGroupBox
//
this.extensionsGroupBox.Controls.Add(this.remarkTextBox);
this.extensionsGroupBox.Controls.Add(this.label16);
this.extensionsGroupBox.Controls.Add(this.textBox3);
this.extensionsGroupBox.Controls.Add(this.label15);
this.extensionsGroupBox.Controls.Add(this.textBox2);
this.extensionsGroupBox.Controls.Add(this.label14);
this.extensionsGroupBox.Controls.Add(this.textBox1);
this.extensionsGroupBox.Controls.Add(this.label13);
this.extensionsGroupBox.Controls.Add(this.ext4Label);
this.extensionsGroupBox.Controls.Add(this.ext4TextBox);
this.extensionsGroupBox.Controls.Add(this.ext3Label);
@ -409,6 +425,46 @@ namespace TBF.BenchControl.DataEntry.Standard12
resources.ApplyResources(this.ext1TextBox, "ext1TextBox");
this.ext1TextBox.Name = "ext1TextBox";
//
// label13
//
resources.ApplyResources(this.label13, "label13");
this.label13.Name = "label13";
//
// textBox1
//
resources.ApplyResources(this.textBox1, "textBox1");
this.textBox1.Name = "textBox1";
//
// textBox2
//
resources.ApplyResources(this.textBox2, "textBox2");
this.textBox2.Name = "textBox2";
//
// label14
//
resources.ApplyResources(this.label14, "label14");
this.label14.Name = "label14";
//
// textBox3
//
resources.ApplyResources(this.textBox3, "textBox3");
this.textBox3.Name = "textBox3";
//
// label15
//
resources.ApplyResources(this.label15, "label15");
this.label15.Name = "label15";
//
// textBox4
//
resources.ApplyResources(this.remarkTextBox, "textBox4");
this.remarkTextBox.Name = "textBox4";
//
// label16
//
resources.ApplyResources(this.label16, "label16");
this.label16.Name = "label16";
//
// CycleBeginningForm
//
resources.ApplyResources(this, "$this");
@ -518,5 +574,13 @@ namespace TBF.BenchControl.DataEntry.Standard12
private System.Windows.Forms.TextBox ext2TextBox;
private System.Windows.Forms.Label ext1Label;
private System.Windows.Forms.TextBox ext1TextBox;
private System.Windows.Forms.TextBox remarkTextBox;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label label13;
}
}

72
TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs
View File

@ -15,12 +15,18 @@ namespace TBF.BenchControl.DataEntry.Standard12
/// <summary> Number of water meters </summary>
public readonly int WaterMetersCount;
public readonly bool SensusExtensions;
/// To be retrieved after the form is closed
public string PurchaseOrder;
public string[] SNText;
public bool[] Disabled;
public string IDNumber;
public string BeforeSN;
public string AfterSN;
public string Remark;
/// Set to 'true' when the form closes
public bool Completed { get { return completed; } }
bool completed;
@ -38,22 +44,19 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
InitializeComponent();
textBoxesCount = 12;
labels = new Label[]
{
label1, label2, label3, label4, label5, label6,
label7, label8, label9, label10, label11, label12,
};
comboBoxes = new ComboBox[]
{
comboBox1, comboBox2, comboBox3, comboBox4, comboBox5, comboBox6,
comboBox7, comboBox8, comboBox9, comboBox10, comboBox11, comboBox12,
};
checkBoxes = new CheckBox[]
{
checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6,
checkBox7, checkBox8, checkBox9, checkBox10, checkBox11, checkBox12,
};
labels = new Label[] { label1, label2, label3, label4, label5, label6,
label7, label8, label9, label10, label11, label12 };
comboBoxes = new ComboBox[] { comboBox1, comboBox2, comboBox3, comboBox4, comboBox5, comboBox6,
comboBox7, comboBox8, comboBox9, comboBox10, comboBox11, comboBox12 };
checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6,
checkBox7, checkBox8, checkBox9, checkBox10, checkBox11, checkBox12 };
if (labels.Length != comboBoxes.Length || labels.Length != checkBoxes.Length) throw new Exception("Error in CycleBeginningForm()");
textBoxesCount = labels.Length;
enabledComboBoxes = new List<ComboBox>();
completed = false;
@ -64,16 +67,31 @@ namespace TBF.BenchControl.DataEntry.Standard12
/// Constructor
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public CycleBeginningForm(int waterMetersCount)
public CycleBeginningForm(Results.Entities.WaterMeter[] waterMeters, bool sensusExtensions)
: this()
{
this.WaterMetersCount = waterMetersCount;
this.WaterMetersCount = waterMeters.Length;
this.SensusExtensions = sensusExtensions;
SNText = new string[WaterMetersCount];
Disabled = new bool[WaterMetersCount];
ShuffleTextBoxes(Config.Data.WMsCount, Config.Data.LineSize);
//Height = 147 + WaterMetersCount * 90;
Height = 147 + WaterMetersCount * 45; /// Adjust the window size
if (sensusExtensions)
{
if (Height < 605) Height = 605; /// Minimum height for the extensionsGroupBox
}
else
{
/// Hide extensionsGroupBox, etc.
int delta = extensionsGroupBox.Width + 45;
extensionsGroupBox.Visible = false;
okButton.Left -= delta;
clearButton.Left -= delta;
Width -= delta;
}
}
/// <summary>
@ -119,6 +137,14 @@ namespace TBF.BenchControl.DataEntry.Standard12
labels[i].Visible = comboBoxes[i].Visible = checkBoxes[i].Visible = true;
enabledComboBoxes.Add(comboBoxes[i]);
}
if (SensusExtensions)
{
textBox1.Text = (Program.LocalSettings.LastText1 == null) ? string.Empty : Program.LocalSettings.LastText1;
textBox2.Text = (Program.LocalSettings.LastText2 == null) ? string.Empty : Program.LocalSettings.LastText2;
textBox3.Text = (Program.LocalSettings.LastText3 == null) ? string.Empty : Program.LocalSettings.LastText3;
remarkTextBox.Text = (Program.LocalSettings.LastRemark == null) ? string.Empty : Program.LocalSettings.LastRemark;
}
}
void Localize()
@ -168,6 +194,14 @@ namespace TBF.BenchControl.DataEntry.Standard12
Disabled[i] = !checkBoxes[i].Checked;
}
if (SensusExtensions)
{
Program.LocalSettings.LastText1 = IDNumber = string.IsNullOrEmpty(textBox1.Text) ? null : textBox1.Text;
Program.LocalSettings.LastText2 = BeforeSN = string.IsNullOrEmpty(textBox2.Text) ? null : textBox2.Text;
Program.LocalSettings.LastText3 = AfterSN = string.IsNullOrEmpty(textBox3.Text) ? null : textBox3.Text;
Program.LocalSettings.LastRemark = Remark = string.IsNullOrEmpty(remarkTextBox.Text) ? null : remarkTextBox.Text;
}
completed = true;
Close();
}

258
TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx
View File

@ -122,7 +122,7 @@
<value>Verdana, 14.25pt</value>
</data>
<data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
<value>786, 24</value>
<value>836, 24</value>
</data>
<data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 54</value>
@ -146,6 +146,15 @@
<data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
<value>39</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>
@ -185,27 +194,6 @@
<data name="&gt;&gt;orderGroupBox.ZOrder" xml:space="preserve">
<value>38</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>
<data name="clearButton.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
</data>
@ -214,7 +202,7 @@
<value>NoControl</value>
</data>
<data name="clearButton.Location" type="System.Drawing.Point, System.Drawing">
<value>786, 97</value>
<value>836, 97</value>
</data>
<data name="clearButton.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 54</value>
@ -1347,6 +1335,207 @@
<data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="textBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 502</value>
</data>
<data name="textBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>274, 31</value>
</data>
<data name="textBox4.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
</data>
<data name="&gt;&gt;textBox4.Name" xml:space="preserve">
<value>textBox4</value>
</data>
<data name="&gt;&gt;textBox4.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;textBox4.Parent" xml:space="preserve">
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;textBox4.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="label16.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label16.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label16.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 468</value>
</data>
<data name="label16.Size" type="System.Drawing.Size, System.Drawing">
<value>115, 23</value>
</data>
<data name="label16.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="label16.Text" xml:space="preserve">
<value>Poznámka:</value>
</data>
<data name="&gt;&gt;label16.Name" xml:space="preserve">
<value>label16</value>
</data>
<data name="&gt;&gt;label16.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;label16.Parent" xml:space="preserve">
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="textBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 415</value>
</data>
<data name="textBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>274, 31</value>
</data>
<data name="textBox3.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
</data>
<data name="&gt;&gt;textBox3.Name" xml:space="preserve">
<value>textBox3</value>
</data>
<data name="&gt;&gt;textBox3.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;textBox3.Parent" xml:space="preserve">
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;textBox3.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="label15.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label15.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label15.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 381</value>
</data>
<data name="label15.Size" type="System.Drawing.Size, System.Drawing">
<value>165, 23</value>
</data>
<data name="label15.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
</data>
<data name="label15.Text" xml:space="preserve">
<value>Dodatok za s/n:</value>
</data>
<data name="&gt;&gt;label15.Name" xml:space="preserve">
<value>label15</value>
</data>
<data name="&gt;&gt;label15.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;label15.Parent" xml:space="preserve">
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="textBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 326</value>
</data>
<data name="textBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>274, 31</value>
</data>
<data name="textBox2.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="&gt;&gt;textBox2.Name" xml:space="preserve">
<value>textBox2</value>
</data>
<data name="&gt;&gt;textBox2.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;textBox2.Parent" xml:space="preserve">
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;textBox2.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="label14.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label14.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label14.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 292</value>
</data>
<data name="label14.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 23</value>
</data>
<data name="label14.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="label14.Text" xml:space="preserve">
<value>Dodatok pred s/n:</value>
</data>
<data name="&gt;&gt;label14.Name" xml:space="preserve">
<value>label14</value>
</data>
<data name="&gt;&gt;label14.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;label14.Parent" xml:space="preserve">
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 245</value>
</data>
<data name="textBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>274, 31</value>
</data>
<data name="textBox1.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="&gt;&gt;textBox1.Name" xml:space="preserve">
<value>textBox1</value>
</data>
<data name="&gt;&gt;textBox1.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;textBox1.Parent" xml:space="preserve">
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="label13.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 211</value>
</data>
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 23</value>
</data>
<data name="label13.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="label13.Text" xml:space="preserve">
<value>Identifikačné číslo:</value>
</data>
<data name="&gt;&gt;label13.Name" xml:space="preserve">
<value>label13</value>
</data>
<data name="&gt;&gt;label13.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;label13.Parent" xml:space="preserve">
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="ext4Label.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -1375,7 +1564,7 @@
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;ext4Label.ZOrder" xml:space="preserve">
<value>0</value>
<value>8</value>
</data>
<data name="ext4TextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 156</value>
@ -1396,7 +1585,7 @@
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;ext4TextBox.ZOrder" xml:space="preserve">
<value>1</value>
<value>9</value>
</data>
<data name="ext3Label.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -1426,7 +1615,7 @@
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;ext3Label.ZOrder" xml:space="preserve">
<value>2</value>
<value>10</value>
</data>
<data name="ext3TextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 117</value>
@ -1447,7 +1636,7 @@
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;ext3TextBox.ZOrder" xml:space="preserve">
<value>3</value>
<value>11</value>
</data>
<data name="ext2Label.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -1477,7 +1666,7 @@
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;ext2Label.ZOrder" xml:space="preserve">
<value>4</value>
<value>12</value>
</data>
<data name="ext2TextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 78</value>
@ -1498,7 +1687,7 @@
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;ext2TextBox.ZOrder" xml:space="preserve">
<value>5</value>
<value>13</value>
</data>
<data name="ext1Label.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -1525,7 +1714,7 @@
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;ext1Label.ZOrder" xml:space="preserve">
<value>6</value>
<value>14</value>
</data>
<data name="ext1TextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>23, 39</value>
@ -1546,7 +1735,7 @@
<value>extensionsGroupBox</value>
</data>
<data name="&gt;&gt;ext1TextBox.ZOrder" xml:space="preserve">
<value>7</value>
<value>15</value>
</data>
<data name="extensionsGroupBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
@ -1555,7 +1744,7 @@
<value>470, 12</value>
</data>
<data name="extensionsGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>272, 363</value>
<value>322, 551</value>
</data>
<data name="extensionsGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>45</value>
@ -1585,7 +1774,10 @@
<value>True</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>967, 651</value>
<value>1017, 651</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Batch data</value>

28
TestBenchFramework/BenchControl/DataEntry/Standard12/EntryForm.cs
View File

@ -40,6 +40,14 @@ namespace TBF.BenchControl.DataEntry.Standard12
string[] wmStartStateStr;
///
/// Sensus extensions
///
public string IDNumber;
public string BeforeSN;
public string AfterSN;
public string Remark;
System.Windows.Forms.Form modelessDlg;
@ -123,7 +131,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
///
void OpenBeginningDlg(EntryForm myRef)
{
myRef.modelessDlg = new CycleBeginningForm(Config.Data.WMsCount);
myRef.modelessDlg = new CycleBeginningForm(myRef.waterMeters, entryFormCfg.SensusExtensions);
modelessDlg.Show();
}
///
@ -202,6 +210,10 @@ namespace TBF.BenchControl.DataEntry.Standard12
serialNr[i] = waterMeters[i].SerialNr = dlg.SNText[i];
disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
}
IDNumber = dlg.IDNumber;
BeforeSN = dlg.BeforeSN;
AfterSN = dlg.AfterSN;
Remark = dlg.Remark;
}
}
}
@ -269,9 +281,21 @@ namespace TBF.BenchControl.DataEntry.Standard12
/// <param name="batchResults">Test results to be updated with the information</param>
public void UpdateTestResults(Results.BatchResults batchResults)
{
batchResults.Batch.Remark = Remark;
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
if (wm != null && !wm.Disabled)
{
wm.PurchaseOrder = PurchaseOrder;
if (entryFormCfg.SensusExtensions)
{
wm.WaterMeterData.Text1 = IDNumber;
wm.WaterMeterData.Text2 = BeforeSN;
wm.WaterMeterData.Text3 = AfterSN;
}
}
}
}
}

2
TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs
View File

@ -41,7 +41,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
enterSNsAtTheEndCheckBox.Text = Strings.Enter_SNs_at_the_end;
showEndStateFormCheckBox.Text = Strings.Show_cycle_end_form;
sensusExtensionsCheckBox.Text = Strings.Sensus_production_extensions;
sensusExtensionsCheckBox.Text = Strings.Sensus_extensions;
}
public void Closing()

4
TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs generated
View File

@ -93,9 +93,9 @@ namespace TBF.BenchControl.DataEntry.Standard12
this.sensusExtensionsCheckBox.Enabled = false;
this.sensusExtensionsCheckBox.Location = new System.Drawing.Point(99, 135);
this.sensusExtensionsCheckBox.Name = "sensusExtensionsCheckBox";
this.sensusExtensionsCheckBox.Size = new System.Drawing.Size(167, 17);
this.sensusExtensionsCheckBox.Size = new System.Drawing.Size(114, 17);
this.sensusExtensionsCheckBox.TabIndex = 5;
this.sensusExtensionsCheckBox.Text = "Sensus production extensions";
this.sensusExtensionsCheckBox.Text = "Sensus extensions";
this.sensusExtensionsCheckBox.UseVisualStyleBackColor = true;
//
// EntryFormCfgCtrl

2
TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs
View File

@ -41,7 +41,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
enterSNsAtTheEndCheckBox.Text = Strings.Enter_SNs_at_the_end;
showEndStateFormCheckBox.Text = Strings.Show_cycle_end_form;
sensusExtensionsCheckBox.Text = Strings.Sensus_production_extensions;
sensusExtensionsCheckBox.Text = Strings.Sensus_extensions;
}
public void Closing()

2
TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs
View File

@ -41,7 +41,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
{
enterSNsAtTheEndCheckBox.Text = Strings.Enter_SNs_at_the_end;
showEndStateFormCheckBox.Text = Strings.Show_cycle_end_form;
sensusExtensionsCheckBox.Text = Strings.Sensus_production_extensions;
sensusExtensionsCheckBox.Text = Strings.Sensus_extensions;
}
public void Closing()

2
TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs
View File

@ -41,7 +41,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
enterSNsAtTheEndCheckBox.Text = Strings.Enter_SNs_at_the_end;
showEndStateFormCheckBox.Text = Strings.Show_cycle_end_form;
sensusExtensionsCheckBox.Text = Strings.Sensus_production_extensions;
sensusExtensionsCheckBox.Text = Strings.Sensus_extensions;
}
public void Closing()

5
TestBenchFramework/LocalSettings.cs
View File

@ -163,6 +163,11 @@ namespace TBF
[XmlIgnore]
public int LastAuxSNTextsCount { get { return (LastAuxSNTexts != null) ? LastAuxSNTexts.Length : 0; } }
public string LastText1;
public string LastText2;
public string LastText3;
public string LastRemark;
/// Purchase order history
public string[] PurchaseOrderHistory;
[XmlIgnore]

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.7.307.1")]
[assembly: AssemblyFileVersion("2.7.307.1")]
[assembly: AssemblyVersion("2.8.308.1")]
[assembly: AssemblyFileVersion("2.8.308.1")]

6
TestBenchFramework/Resources/Strings.Designer.cs generated
View File

@ -2941,11 +2941,11 @@ namespace TBF.Resources {
}
/// <summary>
/// Looks up a localized string similar to Sensus production extensions.
/// Looks up a localized string similar to Sensus extensions.
/// </summary>
internal static string Sensus_production_extensions {
internal static string Sensus_extensions {
get {
return ResourceManager.GetString("Sensus_production_extensions", resourceCulture);
return ResourceManager.GetString("Sensus_extensions", resourceCulture);
}
}

4
TestBenchFramework/Resources/Strings.resx
View File

@ -1414,8 +1414,8 @@
<data name="Printed" xml:space="preserve">
<value>Printed</value>
</data>
<data name="Sensus_production_extensions" xml:space="preserve">
<value>Sensus production extensions</value>
<data name="Sensus_extensions" xml:space="preserve">
<value>Sensus extensions</value>
</data>
<data name="PO" xml:space="preserve">
<value>PO</value>