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

DataEntry.Standard6 supports remarks (batch and watermeters), ver. 2.18.799

Browse Source
This commit is contained in:
Milan Hanajik
2018-02-05 17:41:29 +01:00
parent 6bf5bdce2b
commit 2c7d1af146
16 changed files with 528 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs
Generated
+156 -49
View File
@@ -44,53 +44,62 @@ namespace TBF.BenchControl.DataEntry.Standard6
this.label5 = new System.Windows.Forms.Label();
this.textBox6 = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.remarkTextBox1 = new System.Windows.Forms.TextBox();
this.stateLabel = new System.Windows.Forms.Label();
this.remarkLabel = new System.Windows.Forms.Label();
this.remarkTextBox2 = new System.Windows.Forms.TextBox();
this.remarkTextBox3 = new System.Windows.Forms.TextBox();
this.remarkTextBox4 = new System.Windows.Forms.TextBox();
this.remarkTextBox5 = new System.Windows.Forms.TextBox();
this.remarkTextBox6 = new System.Windows.Forms.TextBox();
this.batchRemarkButton = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// textBox2
//
this.textBox2.Location = new System.Drawing.Point(205, 66);
this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.textBox2.Location = new System.Drawing.Point(200, 107);
this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(169, 27);
this.textBox2.Size = new System.Drawing.Size(159, 31);
this.textBox2.TabIndex = 1;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(38, 71);
this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Location = new System.Drawing.Point(26, 110);
this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(62, 18);
this.label2.Size = new System.Drawing.Size(147, 23);
this.label2.TabIndex = 0;
this.label2.Text = "Stand:";
this.label2.Text = "Water meter 2";
//
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(205, 30);
this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.textBox1.Location = new System.Drawing.Point(200, 61);
this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(169, 27);
this.textBox1.Size = new System.Drawing.Size(159, 31);
this.textBox1.TabIndex = 1;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(38, 35);
this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Location = new System.Drawing.Point(26, 64);
this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(62, 18);
this.label1.Size = new System.Drawing.Size(147, 23);
this.label1.TabIndex = 0;
this.label1.Text = "Stand:";
this.label1.Text = "Water meter 1";
//
// okButton
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
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(414, 30);
this.okButton.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.okButton.Location = new System.Drawing.Point(858, 32);
this.okButton.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(90, 60);
this.okButton.Size = new System.Drawing.Size(108, 60);
this.okButton.TabIndex = 7;
this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true;
@@ -98,82 +107,171 @@ namespace TBF.BenchControl.DataEntry.Standard6
//
// textBox3
//
this.textBox3.Location = new System.Drawing.Point(205, 102);
this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.textBox3.Location = new System.Drawing.Point(200, 153);
this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(169, 27);
this.textBox3.Size = new System.Drawing.Size(159, 31);
this.textBox3.TabIndex = 1;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(38, 107);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Location = new System.Drawing.Point(26, 156);
this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(62, 18);
this.label3.Size = new System.Drawing.Size(147, 23);
this.label3.TabIndex = 0;
this.label3.Text = "Stand:";
this.label3.Text = "Water meter 3";
//
// textBox4
//
this.textBox4.Location = new System.Drawing.Point(205, 138);
this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.textBox4.Location = new System.Drawing.Point(200, 199);
this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(169, 27);
this.textBox4.Size = new System.Drawing.Size(159, 31);
this.textBox4.TabIndex = 1;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(38, 143);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Location = new System.Drawing.Point(26, 202);
this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(62, 18);
this.label4.Size = new System.Drawing.Size(147, 23);
this.label4.TabIndex = 0;
this.label4.Text = "Stand:";
this.label4.Text = "Water meter 4";
//
// textBox5
//
this.textBox5.Location = new System.Drawing.Point(205, 174);
this.textBox5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.textBox5.Location = new System.Drawing.Point(200, 245);
this.textBox5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(169, 27);
this.textBox5.Size = new System.Drawing.Size(159, 31);
this.textBox5.TabIndex = 1;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(38, 179);
this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Location = new System.Drawing.Point(26, 248);
this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(62, 18);
this.label5.Size = new System.Drawing.Size(147, 23);
this.label5.TabIndex = 0;
this.label5.Text = "Stand:";
this.label5.Text = "Water meter 5";
//
// textBox6
//
this.textBox6.Location = new System.Drawing.Point(205, 210);
this.textBox6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.textBox6.Location = new System.Drawing.Point(200, 291);
this.textBox6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox6.Name = "textBox6";
this.textBox6.Size = new System.Drawing.Size(169, 27);
this.textBox6.Size = new System.Drawing.Size(159, 31);
this.textBox6.TabIndex = 1;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(38, 215);
this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Location = new System.Drawing.Point(26, 294);
this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(62, 18);
this.label6.Size = new System.Drawing.Size(147, 23);
this.label6.TabIndex = 0;
this.label6.Text = "Stand:";
this.label6.Text = "Water meter 6";
//
// remarkTextBox1
//
this.remarkTextBox1.Location = new System.Drawing.Point(400, 61);
this.remarkTextBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.remarkTextBox1.Name = "remarkTextBox1";
this.remarkTextBox1.Size = new System.Drawing.Size(421, 31);
this.remarkTextBox1.TabIndex = 8;
//
// stateLabel
//
this.stateLabel.AutoSize = true;
this.stateLabel.Location = new System.Drawing.Point(196, 24);
this.stateLabel.Name = "stateLabel";
this.stateLabel.Size = new System.Drawing.Size(68, 23);
this.stateLabel.TabIndex = 9;
this.stateLabel.Text = "State:";
//
// remarkLabel
//
this.remarkLabel.AutoSize = true;
this.remarkLabel.Location = new System.Drawing.Point(396, 24);
this.remarkLabel.Name = "remarkLabel";
this.remarkLabel.Size = new System.Drawing.Size(211, 23);
this.remarkLabel.TabIndex = 10;
this.remarkLabel.Text = "Water meter remark:";
//
// remarkTextBox2
//
this.remarkTextBox2.Location = new System.Drawing.Point(400, 107);
this.remarkTextBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.remarkTextBox2.Name = "remarkTextBox2";
this.remarkTextBox2.Size = new System.Drawing.Size(421, 31);
this.remarkTextBox2.TabIndex = 11;
//
// remarkTextBox3
//
this.remarkTextBox3.Location = new System.Drawing.Point(400, 153);
this.remarkTextBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.remarkTextBox3.Name = "remarkTextBox3";
this.remarkTextBox3.Size = new System.Drawing.Size(421, 31);
this.remarkTextBox3.TabIndex = 12;
//
// remarkTextBox4
//
this.remarkTextBox4.Location = new System.Drawing.Point(400, 199);
this.remarkTextBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.remarkTextBox4.Name = "remarkTextBox4";
this.remarkTextBox4.Size = new System.Drawing.Size(421, 31);
this.remarkTextBox4.TabIndex = 13;
//
// remarkTextBox5
//
this.remarkTextBox5.Location = new System.Drawing.Point(400, 245);
this.remarkTextBox5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.remarkTextBox5.Name = "remarkTextBox5";
this.remarkTextBox5.Size = new System.Drawing.Size(421, 31);
this.remarkTextBox5.TabIndex = 14;
//
// remarkTextBox6
//
this.remarkTextBox6.Location = new System.Drawing.Point(400, 291);
this.remarkTextBox6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.remarkTextBox6.Name = "remarkTextBox6";
this.remarkTextBox6.Size = new System.Drawing.Size(421, 31);
this.remarkTextBox6.TabIndex = 15;
//
// batchRemarkButton
//
this.batchRemarkButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.batchRemarkButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.batchRemarkButton.ForeColor = System.Drawing.Color.Black;
this.batchRemarkButton.Location = new System.Drawing.Point(858, 107);
this.batchRemarkButton.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.batchRemarkButton.Name = "batchRemarkButton";
this.batchRemarkButton.Size = new System.Drawing.Size(108, 60);
this.batchRemarkButton.TabIndex = 16;
this.batchRemarkButton.Text = "Batch remark";
this.batchRemarkButton.UseVisualStyleBackColor = true;
this.batchRemarkButton.Click += new System.EventHandler(this.batchRemarkButton_Click);
//
// CycleEndForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 18F);
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 23F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.DarkGoldenrod;
this.ClientSize = new System.Drawing.Size(541, 264);
this.ClientSize = new System.Drawing.Size(1001, 349);
this.Controls.Add(this.batchRemarkButton);
this.Controls.Add(this.remarkTextBox6);
this.Controls.Add(this.remarkTextBox5);
this.Controls.Add(this.remarkTextBox4);
this.Controls.Add(this.remarkTextBox3);
this.Controls.Add(this.remarkTextBox2);
this.Controls.Add(this.remarkLabel);
this.Controls.Add(this.stateLabel);
this.Controls.Add(this.remarkTextBox1);
this.Controls.Add(this.textBox6);
this.Controls.Add(this.label6);
this.Controls.Add(this.textBox5);
@@ -187,9 +285,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
this.Controls.Add(this.textBox1);
this.Controls.Add(this.label1);
this.Controls.Add(this.okButton);
this.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.Name = "CycleEndForm";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.Text = "Daten";
@@ -215,6 +313,15 @@ namespace TBF.BenchControl.DataEntry.Standard6
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox textBox6;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox remarkTextBox1;
private System.Windows.Forms.Label stateLabel;
private System.Windows.Forms.Label remarkLabel;
private System.Windows.Forms.TextBox remarkTextBox2;
private System.Windows.Forms.TextBox remarkTextBox3;
private System.Windows.Forms.TextBox remarkTextBox4;
private System.Windows.Forms.TextBox remarkTextBox5;
private System.Windows.Forms.TextBox remarkTextBox6;
private System.Windows.Forms.Button batchRemarkButton;
}
}
TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs
+40 -15
View File
@@ -14,9 +14,12 @@ namespace TBF.BenchControl.DataEntry.Standard6
/// <summary> Number of text boxes for serial numbers </summary>
public readonly int WaterMetersCount;
public readonly bool RemarkEnabled;
// To be retrieved after the form closes
public string[] EndStateText;
public string[] Remark;
public string BatchRemark;
// Set to 'true' when the form closes
public bool Completed { get { return completed; } }
@@ -24,7 +27,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
int textBoxesCount;
Label[] labels;
TextBox[] textBoxes;
TextBox[] stateBoxes;
TextBox[] remarkBoxes;
/// <summary>
@@ -36,15 +40,11 @@ namespace TBF.BenchControl.DataEntry.Standard6
InitializeComponent();
ControlBox = false;
labels = new Label[]
{
label1, label2, label3, label4, label5, label6,
};
textBoxes = new TextBox[]
{
textBox1, textBox2, textBox3, textBox4, textBox5, textBox6,
};
textBoxesCount = textBoxes.Length;
labels = new Label[] { label1, label2, label3, label4, label5, label6 };
stateBoxes = new TextBox[] { textBox1, textBox2, textBox3, textBox4, textBox5, textBox6 };
remarkBoxes = new TextBox[] { remarkTextBox1, remarkTextBox2, remarkTextBox3,
remarkTextBox4, remarkTextBox5, remarkTextBox6 };
textBoxesCount = stateBoxes.Length;
this.WaterMetersCount = textBoxesCount;
completed = false;
@@ -52,25 +52,37 @@ namespace TBF.BenchControl.DataEntry.Standard6
}
/// <summary> Parameterless constructor for 3 watermeters </summary>
public CycleEndForm(int waterMetersCount)
public CycleEndForm(int waterMetersCount, bool remarkEnabled)
: this()
{
this.WaterMetersCount = waterMetersCount;
this.RemarkEnabled = remarkEnabled;
EndStateText = new string[WaterMetersCount];
Remark = new string[WaterMetersCount];
}
private void CycleEndForm_Load(object sender, EventArgs e)
{
Localize();
Height = 60 + 36 * WaterMetersCount;
Height = 100 + 46 * WaterMetersCount;
if (!RemarkEnabled)
{
remarkLabel.Visible = false;
batchRemarkButton.Visible = false;
Width -= remarkTextBox1.Width;
}
for (int i = 0; i < textBoxesCount; i++)
{
if (!RemarkEnabled) remarkBoxes[i].Visible = false;
if (i >= WaterMetersCount)
{
labels[i].Visible = false;
textBoxes[i].Visible = false;
stateBoxes[i].Visible = false;
remarkBoxes[i].Visible = false;
}
}
}
@@ -82,15 +94,19 @@ namespace TBF.BenchControl.DataEntry.Standard6
for (int i = 0; i < WaterMetersCount; i++)
{
labels[i].Text = string.Format("{0} {1}:", Strings.Water_Meter, (i + 1).ToString());
labels[i].Text = string.Format("{0} {1}:", Strings.Water_Meter, i + 1);
}
stateLabel.Text = string.Format("{0}:", Strings.State);
remarkLabel.Text = string.Format("{0} {1}:", Strings.Water_Meter, Strings.Remark);
}
private void okButton_Click(object sender, EventArgs e)
{
for (int i = 0; i < WaterMetersCount; i++)
{
EndStateText[i] = textBoxes[i].Text;
EndStateText[i] = stateBoxes[i].Text;
Remark[i] = remarkBoxes[i].Text;
}
completed = true;
@@ -115,5 +131,14 @@ namespace TBF.BenchControl.DataEntry.Standard6
}
#endregion
private void batchRemarkButton_Click(object sender, EventArgs e)
{
TBF.Forms.RemarkDlg dlg = new TBF.Forms.RemarkDlg() { Remark = ((BatchRemark == null) ? string.Empty : BatchRemark) };
if (dlg.ShowDialog() == DialogResult.OK)
{
BatchRemark = dlg.Remark;
}
}
}
}
TBF/BenchControl/DataEntry/Standard6/EntryFormCfg.cs
+5 -2
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -21,6 +21,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
///
public bool EnterSerialNrsAtTheEnd;
public bool ShowCycleEndForm;
public bool RemarkEnabled;
public bool SensusExtensions;
/// Private parameterless constructor invoked by all other (public) constructors
@@ -30,6 +31,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
ParentName = string.Empty;
EnterSerialNrsAtTheEnd = false;
ShowCycleEndForm = false;
RemarkEnabled = false;
SensusExtensions = false;
}
@@ -41,7 +43,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
public string ToString(int i)
{
return string.Format("Name={0}, EnterSNsAtTheEnd={1}, ShowEndForm={2}, SensusExt={3}", Name, EnterSerialNrsAtTheEnd, ShowCycleEndForm, SensusExtensions);
return string.Format("Name={0}, EnterSNsAtTheEnd={1}, ShowEndForm={2}, Remark={3}, SensusExt={4}",
Name, EnterSerialNrsAtTheEnd, ShowCycleEndForm, RemarkEnabled, SensusExtensions);
}
}
}
TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs
+4
View File
@@ -41,6 +41,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
enterSNsAtTheEndCheckBox.Text = Strings.Enter_SNs_at_the_end;
showEndStateFormCheckBox.Text = Strings.Show_cycle_end_form;
remarkEnabledCheckBox.Text = Strings.Enable_Remark;
sensusExtensionsCheckBox.Text = Strings.Sensus_extensions;
}
@@ -55,6 +56,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
nameTextBox.Text = config.Name;
enterSNsAtTheEndCheckBox.Checked = config.EnterSerialNrsAtTheEnd;
showEndStateFormCheckBox.Checked = config.ShowCycleEndForm;
remarkEnabledCheckBox.Checked = config.RemarkEnabled;
sensusExtensionsCheckBox.Checked = config.SensusExtensions;
}
@@ -63,6 +65,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
nameTextBox.Enabled = true;
enterSNsAtTheEndCheckBox.Enabled = true;
showEndStateFormCheckBox.Enabled = true;
remarkEnabledCheckBox.Enabled = true;
sensusExtensionsCheckBox.Enabled = true;
}
@@ -81,6 +84,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
config.Name = nameTextBox.Text;
config.EnterSerialNrsAtTheEnd = enterSNsAtTheEndCheckBox.Checked;
config.ShowCycleEndForm = showEndStateFormCheckBox.Checked;
config.RemarkEnabled = remarkEnabledCheckBox.Checked;
config.SensusExtensions = sensusExtensionsCheckBox.Checked;
return flags;
TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.designer.cs
Generated
+17 -3
View File
@@ -37,6 +37,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
this.showEndStateFormCheckBox = new System.Windows.Forms.CheckBox();
this.enterSNsAtTheEndCheckBox = new System.Windows.Forms.CheckBox();
this.sensusExtensionsCheckBox = new System.Windows.Forms.CheckBox();
this.remarkEnabledCheckBox = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// nameTextBox
@@ -91,17 +92,29 @@ namespace TBF.BenchControl.DataEntry.Standard6
//
this.sensusExtensionsCheckBox.AutoSize = true;
this.sensusExtensionsCheckBox.Enabled = false;
this.sensusExtensionsCheckBox.Location = new System.Drawing.Point(99, 135);
this.sensusExtensionsCheckBox.Location = new System.Drawing.Point(99, 158);
this.sensusExtensionsCheckBox.Name = "sensusExtensionsCheckBox";
this.sensusExtensionsCheckBox.Size = new System.Drawing.Size(167, 17);
this.sensusExtensionsCheckBox.TabIndex = 5;
this.sensusExtensionsCheckBox.TabIndex = 6;
this.sensusExtensionsCheckBox.Text = "Sensus production extensions";
this.sensusExtensionsCheckBox.UseVisualStyleBackColor = true;
//
// remarkEnabledCheckBox
//
this.remarkEnabledCheckBox.AutoSize = true;
this.remarkEnabledCheckBox.Enabled = false;
this.remarkEnabledCheckBox.Location = new System.Drawing.Point(99, 135);
this.remarkEnabledCheckBox.Name = "remarkEnabledCheckBox";
this.remarkEnabledCheckBox.Size = new System.Drawing.Size(99, 17);
this.remarkEnabledCheckBox.TabIndex = 5;
this.remarkEnabledCheckBox.Text = "Enable remarks";
this.remarkEnabledCheckBox.UseVisualStyleBackColor = true;
//
// EntryFormCfgCtrl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.remarkEnabledCheckBox);
this.Controls.Add(this.sensusExtensionsCheckBox);
this.Controls.Add(this.enterSNsAtTheEndCheckBox);
this.Controls.Add(this.showEndStateFormCheckBox);
@@ -109,7 +122,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
this.Controls.Add(this.nameLabel);
this.Controls.Add(this.classNameLabel);
this.Name = "EntryFormCfgCtrl";
this.Size = new System.Drawing.Size(300, 200);
this.Size = new System.Drawing.Size(450, 300);
this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
this.ResumeLayout(false);
this.PerformLayout();
@@ -124,5 +137,6 @@ namespace TBF.BenchControl.DataEntry.Standard6
private System.Windows.Forms.CheckBox showEndStateFormCheckBox;
private System.Windows.Forms.CheckBox enterSNsAtTheEndCheckBox;
private System.Windows.Forms.CheckBox sensusExtensionsCheckBox;
private System.Windows.Forms.CheckBox remarkEnabledCheckBox;
}
}
TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs
+19 -6
View File
@@ -26,10 +26,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
string purchaseOrder;
public string PurchaseOrder { get { return purchaseOrder; } }
bool[] disabled; /// This array is shared between forms
string batchRemark;
string[] wmCycleEndState;
public string WMCycleEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmCycleEndState.Length) ? wmCycleEndState[wmNr] : string.Empty; }
bool[] disabled; /// This array is shared between forms
double[] wmStartState;
public double WMStartState(int wmNr) { return (wmNr >= 0 && wmNr < wmStartState.Length) ? wmStartState[wmNr] : 0; }
@@ -75,7 +74,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
wmStartState = new double[Config.Data.WMsCount];
wmStartStateStr = new string[Config.Data.WMsCount];
wmEndState = new double[Config.Data.WMsCount];
wmCycleEndState = new string[Config.Data.WMsCount];
batchRemark = null;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
@@ -130,7 +129,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
///
void OpenEndDlg(EntryFormNoStartEnd myRef)
{
myRef.modelessDlg = new CycleEndForm(myRef.waterMeters.Length);
myRef.modelessDlg = new CycleEndForm(myRef.waterMeters.Length, entryFormCfg.RemarkEnabled);
modelessDlg.Show();
}
///
@@ -217,10 +216,19 @@ namespace TBF.BenchControl.DataEntry.Standard6
if (waterMeters[i] != null)
{
/// In case entryFormCfg.ShowCycleEndForm == false dlg would be null, values would be string.Empty
wmCycleEndState[i] = waterMeters[i].EndState = (dlg != null) ? dlg.EndStateText[i] : string.Empty;
waterMeters[i].EndState = (dlg != null) ? dlg.EndStateText[i] : string.Empty;
if (entryFormCfg.RemarkEnabled)
{
waterMeters[i].Remark = (dlg != null) ? dlg.Remark[i] : string.Empty;
}
}
}
if (entryFormCfg.RemarkEnabled)
{
batchRemark = dlg.BatchRemark;
}
}
else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates)
{
/// Fixed start test - start
@@ -270,6 +278,11 @@ namespace TBF.BenchControl.DataEntry.Standard6
/// <param name="batchResults">Test results to be updated with the information</param>
public void UpdateTestResults(Results.BatchResults batchResults)
{
if (batchRemark != null)
{
batchResults.Batch.Remark = batchRemark;
}
foreach (var wm in batchResults.WaterMeters)
{
if (wm != null && !wm.Disabled) wm.PurchaseOrder = PurchaseOrder;
TBF/BenchControl/GenericDevices/IHasCycleEndForm.cs
-5
View File
@@ -8,11 +8,6 @@ namespace TBF.BenchControl.GenericDevices
public interface IHasCycleEndForm
{
/// <summary>
/// Water meter states typed in the cycle end form
/// </summary>
string WMCycleEndState(int wmNr);
/// <summary>
/// Displays form at the end of the cycle (usually to enter the end state).
/// </summary>
/// <returns>Operation to be used in the sequence</returns>
TBF/Forms/RemarkDlg.Designer.cs
Generated
+100
View File
@@ -0,0 +1,100 @@
namespace TBF.Forms
{
partial class RemarkDlg
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.closeButton = new System.Windows.Forms.Button();
this.textBox1 = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainer1.Location = new System.Drawing.Point(0, 0);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.textBox1);
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.closeButton);
this.splitContainer1.Size = new System.Drawing.Size(459, 249);
this.splitContainer1.SplitterDistance = 340;
this.splitContainer1.TabIndex = 0;
//
// closeButton
//
this.closeButton.Location = new System.Drawing.Point(18, 21);
this.closeButton.Name = "closeButton";
this.closeButton.Size = new System.Drawing.Size(75, 43);
this.closeButton.TabIndex = 0;
this.closeButton.Text = "Close";
this.closeButton.UseVisualStyleBackColor = true;
this.closeButton.Click += new System.EventHandler(this.closeButton_Click);
//
// textBox1
//
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox1.Location = new System.Drawing.Point(0, 0);
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(340, 249);
this.textBox1.TabIndex = 0;
//
// RemarkDlg
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(459, 249);
this.Controls.Add(this.splitContainer1);
this.Name = "RemarkDlg";
this.Text = "Remark";
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel1.PerformLayout();
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Button closeButton;
}
}
TBF/Forms/RemarkDlg.cs
+25
View File
@@ -0,0 +1,25 @@
using System;
using System.Windows.Forms;
using TBF.Resources;
namespace TBF.Forms
{
public partial class RemarkDlg : Form
{
public string Remark;
public RemarkDlg()
{
InitializeComponent();
Text = Strings.Remark;
textBox1.Text = Remark;
}
private void closeButton_Click(object sender, EventArgs e)
{
Remark = textBox1.Text;
DialogResult = DialogResult.OK;
Close();
}
}
}
TBF/Forms/RemarkDlg.resx
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.798.0")]
[assembly: AssemblyFileVersion("2.18.798.0")]
[assembly: AssemblyVersion("2.18.799.0")]
[assembly: AssemblyFileVersion("2.18.799.0")]
TBF/Resources/Strings.Designer.cs
Generated
+18
View File
@@ -1347,6 +1347,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Enable &apos;Remark&apos;.
/// </summary>
internal static string Enable_Remark {
get {
return ResourceManager.GetString("Enable_Remark", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to End.
/// </summary>
@@ -3480,6 +3489,15 @@ namespace TBF.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>
TBF/Resources/Strings.cs.resx
+4 -1
View File
@@ -898,7 +898,7 @@
<value>Zapnout ventil</value>
</data>
<data name="State" xml:space="preserve">
<value>Stojí</value>
<value>Stav</value>
</data>
<data name="Stop_the_pump" xml:space="preserve">
<value>Zastavte čerpadlo</value>
@@ -1311,4 +1311,7 @@
<data name="to" xml:space="preserve">
<value>do</value>
</data>
<data name="Remark" xml:space="preserve">
<value>Poznámka</value>
</data>
</root>
TBF/Resources/Strings.de.resx
+3
View File
@@ -1452,4 +1452,7 @@
<data name="to" xml:space="preserve">
<value>bis</value>
</data>
<data name="Remark" xml:space="preserve">
<value>Bemerkung</value>
</data>
</root>
TBF/Resources/Strings.resx
+6
View File
@@ -1837,4 +1837,10 @@
<data name="Next_test_volume" xml:space="preserve">
<value>Next test volume</value>
</data>
<data name="Remark" xml:space="preserve">
<value>Remark</value>
</data>
<data name="Enable_Remark" xml:space="preserve">
<value>Enable 'Remark'</value>
</data>
</root>
TBF/TBF.csproj
+9
View File
@@ -1165,6 +1165,12 @@
<Compile Include="Forms\PreviousResultsDlg.Designer.cs">
<DependentUpon>PreviousResultsDlg.cs</DependentUpon>
</Compile>
<Compile Include="Forms\RemarkDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\RemarkDlg.Designer.cs">
<DependentUpon>RemarkDlg.cs</DependentUpon>
</Compile>
<Compile Include="Forms\UpgradeSelectionDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -2469,6 +2475,9 @@
<EmbeddedResource Include="Forms\PrintOrderForm.resx">
<DependentUpon>PrintOrderForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\RemarkDlg.resx">
<DependentUpon>RemarkDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\ResultsArrangementDlg.resx">
<DependentUpon>ResultsArrangementDlg.cs</DependentUpon>
</EmbeddedResource>