DataEntry.Standard6 bug fix, ver. 3.1.1656
This commit is contained in:
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
|
|||||||
// Build Number
|
// Build Number
|
||||||
// Revision
|
// Revision
|
||||||
//
|
//
|
||||||
[assembly: AssemblyVersion("3.1.1655.0")]
|
[assembly: AssemblyVersion("3.1.1656.0")]
|
||||||
[assembly: AssemblyFileVersion("3.1.1655.0")]
|
[assembly: AssemblyFileVersion("3.1.1656.0")]
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace TBF.Rig.DataEntry.Standard6
|
|||||||
checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6 };
|
checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6 };
|
||||||
remarkBoxes = new ComboBox[] { remarkComboBox1, remarkComboBox2, remarkComboBox3, remarkComboBox4, remarkComboBox5, remarkComboBox6 };
|
remarkBoxes = new ComboBox[] { remarkComboBox1, remarkComboBox2, remarkComboBox3, remarkComboBox4, remarkComboBox5, remarkComboBox6 };
|
||||||
|
|
||||||
this.WaterMetersCount = waterMetersCount;
|
this.WaterMetersCount = Math.Min(waterMetersCount, comboBoxes.Length);
|
||||||
this.RemarksEnabled = remarksEnabled;
|
this.RemarksEnabled = remarksEnabled;
|
||||||
|
|
||||||
SNText = new string[WaterMetersCount];
|
SNText = new string[WaterMetersCount];
|
||||||
@@ -128,12 +128,7 @@ namespace TBF.Rig.DataEntry.Standard6
|
|||||||
private void okButton_Click(object sender, EventArgs e)
|
private void okButton_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
PurchaseOrder = orderComboBox.Text;
|
PurchaseOrder = orderComboBox.Text;
|
||||||
Program.LocalSettings.UpdateHistory(orderComboBox.Text,
|
Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
|
||||||
ref Program.LocalSettings.PurchaseOrderHistory
|
|
||||||
#if FUZHOU_150 || FUZHOU_300
|
|
||||||
, 20
|
|
||||||
#endif
|
|
||||||
);
|
|
||||||
|
|
||||||
Program.LocalSettings.LastSNTexts = SNText;
|
Program.LocalSettings.LastSNTexts = SNText;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user