diff --git a/Config/Data.cs b/Config/Data.cs index e281cbb21..7246feedc 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -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() { diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index d9da755d5..fa3eef2f9 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -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")] diff --git a/Results/Entities/Batch.cs b/Results/Entities/Batch.cs index f55022f20..2ec36792a 100644 --- a/Results/Entities/Batch.cs +++ b/Results/Entities/Batch.cs @@ -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; } diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index 9b18e7674..16437f530 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -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 diff --git a/Results/Mappings/BatchMap.cs b/Results/Mappings/BatchMap.cs index 2dbc2a43d..ff0237fea 100644 --- a/Results/Mappings/BatchMap.cs +++ b/Results/Mappings/BatchMap.cs @@ -19,7 +19,10 @@ namespace Results.Mappings Map(x => x.ProcedureName); Map(x => x.ProcedureRevision); Map(x => x.ProtocolTitle); - Map(x => x.Custom1); + Map(x => x.Remark) + .CustomType("StringClob") + .CustomSqlType("varchar(2000)"); + Map(x => x.Custom1); Map(x => x.Custom2); Map(x => x.Custom3); Map(x => x.StartTime); diff --git a/Results/Mappings/WaterMeterMap.cs b/Results/Mappings/WaterMeterMap.cs index 46b644e82..122a0f40d 100644 --- a/Results/Mappings/WaterMeterMap.cs +++ b/Results/Mappings/WaterMeterMap.cs @@ -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); diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 8d651d664..d3a725a66 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -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")] diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs index 6d662a61f..f8ae8d46e 100644 --- a/Results/Resources/Strings.Designer.cs +++ b/Results/Resources/Strings.Designer.cs @@ -555,6 +555,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Remark. + /// + internal static string Remark { + get { + return ResourceManager.GetString("Remark", resourceCulture); + } + } + /// /// Looks up a localized string similar to < Remove. /// @@ -582,6 +591,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Result code. + /// + internal static string Result_code { + get { + return ResourceManager.GetString("Result_code", resourceCulture); + } + } + /// /// Looks up a localized string similar to Results. /// diff --git a/Results/Resources/Strings.cs.resx b/Results/Resources/Strings.cs.resx index cb04d19fc..e2bb5a31a 100644 --- a/Results/Resources/Strings.cs.resx +++ b/Results/Resources/Strings.cs.resx @@ -150,6 +150,9 @@ Přesnost + + Poznámka + < Odebrat @@ -162,6 +165,9 @@ Výsledky + + Kód výsledku + Vybrané výsledky diff --git a/Results/Resources/Strings.de.resx b/Results/Resources/Strings.de.resx index 4d0ff286a..6afbc4172 100644 --- a/Results/Resources/Strings.de.resx +++ b/Results/Resources/Strings.de.resx @@ -375,4 +375,10 @@ Ergebnisse + + Bemerkung + + + Ergebniscode + \ No newline at end of file diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx index 64828e4d7..619202949 100644 --- a/Results/Resources/Strings.resx +++ b/Results/Resources/Strings.resx @@ -378,4 +378,10 @@ Results + + Remark + + + Result code + \ No newline at end of file diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index 46efc9c3e..031d03079 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -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)); } /// diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs index eb5f2acff..c96d18c2c 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs @@ -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; } } \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs index 376248c87..c40a9a780 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs @@ -15,12 +15,18 @@ namespace TBF.BenchControl.DataEntry.Standard12 /// Number of water meters 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; @@ -37,23 +43,20 @@ namespace TBF.BenchControl.DataEntry.Standard12 public CycleBeginningForm() { InitializeComponent(); + + 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; - 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, - }; enabledComboBoxes = new List(); completed = false; @@ -64,16 +67,31 @@ namespace TBF.BenchControl.DataEntry.Standard12 /// Constructor /// /// Number of text boxes for serial numbers - 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; + } } /// @@ -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(); } diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx index 507851c25..c062c1e88 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx +++ b/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx @@ -122,7 +122,7 @@ Verdana, 14.25pt - 786, 24 + 836, 24 140, 54 @@ -146,6 +146,15 @@ 39 + + 90, 31 + + + 260, 31 + + + 0 + orderComboBox @@ -185,27 +194,6 @@ 38 - - 90, 31 - - - 260, 31 - - - 0 - - - orderComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - orderGroupBox - - - 0 - Verdana, 14.25pt @@ -214,7 +202,7 @@ NoControl - 786, 97 + 836, 97 140, 54 @@ -1347,6 +1335,207 @@ 3 + + 23, 502 + + + 274, 31 + + + 15 + + + textBox4 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + extensionsGroupBox + + + 0 + + + True + + + NoControl + + + 9, 468 + + + 115, 23 + + + 14 + + + Poznámka: + + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + extensionsGroupBox + + + 1 + + + 23, 415 + + + 274, 31 + + + 13 + + + textBox3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + extensionsGroupBox + + + 2 + + + True + + + NoControl + + + 9, 381 + + + 165, 23 + + + 12 + + + Dodatok za s/n: + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + extensionsGroupBox + + + 3 + + + 23, 326 + + + 274, 31 + + + 11 + + + textBox2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + extensionsGroupBox + + + 4 + + + True + + + NoControl + + + 9, 292 + + + 187, 23 + + + 10 + + + Dodatok pred s/n: + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + extensionsGroupBox + + + 5 + + + 23, 245 + + + 274, 31 + + + 9 + + + textBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + extensionsGroupBox + + + 6 + + + True + + + 9, 211 + + + 194, 23 + + + 8 + + + Identifikačné číslo: + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + extensionsGroupBox + + + 7 + True @@ -1375,7 +1564,7 @@ extensionsGroupBox - 0 + 8 23, 156 @@ -1396,7 +1585,7 @@ extensionsGroupBox - 1 + 9 True @@ -1426,7 +1615,7 @@ extensionsGroupBox - 2 + 10 23, 117 @@ -1447,7 +1636,7 @@ extensionsGroupBox - 3 + 11 True @@ -1477,7 +1666,7 @@ extensionsGroupBox - 4 + 12 23, 78 @@ -1498,7 +1687,7 @@ extensionsGroupBox - 5 + 13 True @@ -1525,7 +1714,7 @@ extensionsGroupBox - 6 + 14 23, 39 @@ -1546,7 +1735,7 @@ extensionsGroupBox - 7 + 15 Verdana, 14.25pt @@ -1555,7 +1744,7 @@ 470, 12 - 272, 363 + 322, 551 45 @@ -1585,7 +1774,10 @@ True - 967, 651 + 1017, 651 + + + NoControl Batch data diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryForm.cs index 8c116d08d..28ca78269 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryForm.cs @@ -39,6 +39,14 @@ namespace TBF.BenchControl.DataEntry.Standard12 public float WMEndState(int wmNr) { return (wmNr >= 0 && wmNr < wmEndState.Length) ? wmEndState[wmNr] : 0; } 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,7 +210,11 @@ 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; + } } } else if (entryFormCfg.ShowCycleEndForm && currentOp == CurrentOp.ShowFormAtCycleEnd) @@ -269,9 +281,21 @@ namespace TBF.BenchControl.DataEntry.Standard12 /// Test results to be updated with the information public void UpdateTestResults(Results.BatchResults batchResults) { - foreach (var wm in batchResults.WaterMeters) + 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; + } + } } } } diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs index 9e18da3db..68d5ec94f 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs @@ -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() diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs index 3de325a34..86e5f66e2 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs @@ -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 diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs index 0940e4600..a3b3e4550 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs @@ -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() diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs index fb955d692..c749973b2 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs @@ -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() diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs index 5e4c2193d..d391ae74b 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs @@ -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() diff --git a/TestBenchFramework/LocalSettings.cs b/TestBenchFramework/LocalSettings.cs index 586f23f27..7b00760f6 100644 --- a/TestBenchFramework/LocalSettings.cs +++ b/TestBenchFramework/LocalSettings.cs @@ -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] diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 20c8ffdcb..5233a6858 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -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")] diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index ac4283c73..d68efab54 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -2941,11 +2941,11 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to Sensus production extensions. + /// Looks up a localized string similar to Sensus extensions. /// - 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); } } diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index e776f7b9d..e875913d1 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1414,8 +1414,8 @@ Printed - - Sensus production extensions + + Sensus extensions PO