diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestParams.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestParams.cs index 4dad402c9..1cda93c21 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestParams.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestParams.cs @@ -29,8 +29,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest string[] paramNames = new string[] { - Strings.PressureLo_bar, - Strings.PressureHi_bar, + Strings.Pressure_lo_bar, + Strings.Pressure_hi_bar, Strings.Duration_PMax_s, Strings.Duration_Leak_s, }; diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs index 8d9b47d6e..bf73909a0 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs @@ -27,8 +27,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest string[] paramNames = new string[] { - Strings.PressureLo_bar, - Strings.PressureHi_bar, + Strings.Pressure_lo_bar, + Strings.Pressure_hi_bar, Strings.Duration_s, }; public override string ParamName(int i) { return paramNames[i]; } diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index bff6a8075..6f88d9425 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -738,9 +738,9 @@ namespace TBF parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_from_m3h, Width = 80 }); parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_to_m3h, Width = 80 }); parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Pump_power_pct, Width = 90 }); - parametersListViewEx.Columns.Add(new ColumnHeader { Text = "Mass repeats", Width = 90 }); - parametersListViewEx.Columns.Add(new ColumnHeader { Text = "Mass spread [kg]", Width = 110 }); - parametersListViewEx.Columns.Add(new ColumnHeader { Text = "Mass method", Width = 90 }); + parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Mass_repeats, Width = 90 }); + parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Mass_spread_kg, Width = 110 }); + parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Mass_method, Width = 90 }); parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TimePump2StartV_chdr, Width = 70 }); parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TimeBeforeSettingFlow, Width = 70 }); parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TimeFlow2Start_chdr, Width = 70 }); @@ -778,8 +778,8 @@ namespace TBF ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("98"); ((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("100"); - ((ComboBox)parametersEditors[(int)ParametersClmn.MassMethod]).Items.Add("stable"); - ((ComboBox)parametersEditors[(int)ParametersClmn.MassMethod]).Items.Add("fast"); + ((ComboBox)parametersEditors[(int)ParametersClmn.MassMethod]).Items.Add(Strings.stable); + ((ComboBox)parametersEditors[(int)ParametersClmn.MassMethod]).Items.Add(Strings.fast); foreach (var ctrl in parametersEditors) { @@ -1037,7 +1037,7 @@ namespace TBF entity.MassSpread = massSpread; } - entity.MassMethod = lvi.SubItems[(int)ParametersClmn.MassMethod].Text.Equals("fast"); + entity.MassMethod = lvi.SubItems[(int)ParametersClmn.MassMethod].Text.Equals(Strings.fast); if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Pump2StartV].Text, out itmp)) entity.TimePump2StartV = itmp; if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_BeforeFlow].Text, out itmp)) entity.TimeBeforeFlow = itmp; diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index 32a5e7b48..20d769f56 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -915,6 +915,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Do you want to delete the procedure?. + /// + internal static string Do_you_want_to_delete_the_procedure { + get { + return ResourceManager.GetString("Do_you_want_to_delete_the_procedure", resourceCulture); + } + } + /// /// Looks up a localized string similar to Do you want to exit the Test Bench Framework?. /// @@ -1248,6 +1257,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to fast. + /// + internal static string fast { + get { + return ResourceManager.GetString("fast", resourceCulture); + } + } + /// /// Looks up a localized string similar to Feeding. /// @@ -1617,6 +1635,33 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Mass method. + /// + internal static string Mass_method { + get { + return ResourceManager.GetString("Mass_method", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Mass repeats. + /// + internal static string Mass_repeats { + get { + return ResourceManager.GetString("Mass_repeats", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Mass spread [kg]. + /// + internal static string Mass_spread_kg { + get { + return ResourceManager.GetString("Mass_spread_kg", resourceCulture); + } + } + /// /// Looks up a localized string similar to (max. _X_ alphanumeric characters). /// @@ -2247,24 +2292,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to PreasureHi [bar]. - /// - internal static string PressureHi_bar { - get { - return ResourceManager.GetString("PressureHi_bar", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to PressureLo [bar]. - /// - internal static string PressureLo_bar { - get { - return ResourceManager.GetString("PressureLo_bar", resourceCulture); - } - } - /// /// Looks up a localized string similar to Previous results. /// @@ -3057,6 +3084,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to stable. + /// + internal static string stable { + get { + return ResourceManager.GetString("stable", resourceCulture); + } + } + /// /// Looks up a localized string similar to Start. /// diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx index 44212cd72..1dfc1b4ed 100644 --- a/TestBenchFramework/Resources/Strings.cs.resx +++ b/TestBenchFramework/Resources/Strings.cs.resx @@ -349,7 +349,7 @@ Chcete pokračovat? - Chcete uložit postup? + Chcete uložit tento postup? Dolů @@ -688,10 +688,10 @@ Tlak [bar] - Tlak Hi [bar] + Tlak max. [bar] - Tlak Lo [bar] + Tlak min. [bar] Tlakoměr @@ -699,12 +699,6 @@ Výběr tlaku - - Tlak Hi [bar] - - - Tlak Lo [bar] - Tiskárna @@ -1212,6 +1206,9 @@ Zadejte údaje o vodoměrech + + Chcete odstranit tento postup? + Obj. diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 3c6083a83..0a676a9d1 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -928,7 +928,7 @@ Stop Vorbereitung Prüfung - Timeout + Zeit abgelaufen WZ-Serienummer_Stand @@ -1248,7 +1248,37 @@ Tabelle umbenennen + + Möchten Sie den Prüfvorgang löschen? + + + Druck bis [bar] + + + Druck von [bar] + + + Einstellung Druck + + + Prüfdruck einstellen + Best. + + schnell + + + Massemessmethode + + + Masse wiederh. + + + Massespanne [kg] + + + stabil + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.pl.resx b/TestBenchFramework/Resources/Strings.pl.resx index f56678e77..5b3932699 100644 --- a/TestBenchFramework/Resources/Strings.pl.resx +++ b/TestBenchFramework/Resources/Strings.pl.resx @@ -642,12 +642,6 @@ Wybór ciśnienia - - CiśnienieHi [bar] - - - CiśnienieLo [bar] - Drukarka diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 3d90d0ff7..4098cb513 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -955,12 +955,6 @@ Setting the water pressure - - PreasureHi [bar] - - - PressureLo [bar] - Pressure Hi [bar] @@ -1414,13 +1408,31 @@ Printed + + Do you want to delete the procedure? + Sensus extensions + + fast + PO + + Mass method + Purchase order may have max {0} characters + + Mass repeats + + + Mass spread [kg] + + + stable + \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.ro.resx b/TestBenchFramework/Resources/Strings.ro.resx index fea77c1f2..798efdd0d 100644 --- a/TestBenchFramework/Resources/Strings.ro.resx +++ b/TestBenchFramework/Resources/Strings.ro.resx @@ -501,12 +501,6 @@ Selectare domen. Pres - - PresiuneMax[bar] - - - PresiuneMin[bar] - Imprimanta diff --git a/TestBenchFramework/Resources/Strings.zh-CN.resx b/TestBenchFramework/Resources/Strings.zh-CN.resx index 837730fcc..99d9d8cc1 100644 --- a/TestBenchFramework/Resources/Strings.zh-CN.resx +++ b/TestBenchFramework/Resources/Strings.zh-CN.resx @@ -696,12 +696,6 @@ 压力选择 - - 压力高值[bar] - - - 压力低值[bar] - 以前的结果 diff --git a/TestBenchFramework/TestWizard/PressureSelection.cs b/TestBenchFramework/TestWizard/PressureSelection.cs index 23d953afb..aafef9d51 100644 --- a/TestBenchFramework/TestWizard/PressureSelection.cs +++ b/TestBenchFramework/TestWizard/PressureSelection.cs @@ -2,12 +2,6 @@ /// Copyright (c) 2013-2015 Sensus Metering Systems /// using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; using System.Windows.Forms; using Config.Entities; using TBF.Resources; diff --git a/TestBenchFramework/UiControls/ProceduresCtrl.cs b/TestBenchFramework/UiControls/ProceduresCtrl.cs index 6dc562336..f935e707a 100644 --- a/TestBenchFramework/UiControls/ProceduresCtrl.cs +++ b/TestBenchFramework/UiControls/ProceduresCtrl.cs @@ -23,6 +23,7 @@ namespace TBF.UiControls /// enum Column { + ItemNr, Name, Description, ColumnsCount, @@ -38,7 +39,7 @@ namespace TBF.UiControls public ProceduresCtrl() : base() { - Name = "ProceduresCtrl"; + session = null; } public void Initialize(ProceduresDlg parent, Control parentControl) @@ -51,12 +52,14 @@ namespace TBF.UiControls /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; - Columns.Add(Strings.Name, (ls.ProceduresColumnCount > 0) ? ls.ProceduresColumnWidths[0] : (100 * parent.Dpi / PathsDlg.Dpi100pct)); - Columns.Add(Strings.DescriptionColHdr, (ls.ProceduresColumnCount > 1) ? ls.ProceduresColumnWidths[1] : (300 * parent.Dpi / PathsDlg.Dpi100pct)); + Columns.Add(Strings.Nr, (ls.ProceduresColumnCount > 0) ? ls.ProceduresColumnWidths[0] : (30 * parent.Dpi / PathsDlg.Dpi100pct)); + Columns.Add(Strings.Name, (ls.ProceduresColumnCount > 1) ? ls.ProceduresColumnWidths[1] : (100 * parent.Dpi / PathsDlg.Dpi100pct)); + Columns.Add(Strings.DescriptionColHdr, (ls.ProceduresColumnCount > 2) ? ls.ProceduresColumnWidths[2] : (300 * parent.Dpi / PathsDlg.Dpi100pct)); editors = new Control[columnsCount]; /// - editors[(int)Column.Name] = new TextBox(); /// Name + editors[(int)Column.ItemNr] = new TextBox(); /// ItemNr + editors[(int)Column.Name] = new TextBox(); /// Name editors[(int)Column.Description] = new TextBox(); /// Description /// for (int i = 0; i < editors.Length; i++) @@ -71,8 +74,9 @@ namespace TBF.UiControls void ReloadAndRedrawAll() { /// Load the procedures - session = Config.FluentCommon.CreateSession(Config.Entities.DBKind.Config); - MyItems = session.CreateQuery("FROM Procedure WHERE ProcedureState = 'Active' ORDER BY ItemNr") + if (session == null) session = Config.FluentCommon.CreateSession(Config.Entities.DBKind.Config); + + MyItems = session.CreateQuery("FROM Procedure WHERE ProcedureState = 'Active' ORDER BY ItemNr") .List(); base.RedrawAll(); @@ -90,7 +94,8 @@ namespace TBF.UiControls { Procedure entity = (Procedure)myItem; - ListViewItem lvi = new ListViewItem(entity.Name); + ListViewItem lvi = new ListViewItem((entity.ItemNr + 1).ToString()); + lvi.SubItems.Add(entity.Name); lvi.SubItems.Add(entity.Description); lvi.Tag = entity; @@ -100,7 +105,7 @@ namespace TBF.UiControls public override void UpdateOne(ListViewItem lvi, object myItem) { Procedure entity = (Procedure)myItem; - entity.Name = lvi.Text; + entity.Name = lvi.SubItems[(int)Column.Name].Text; entity.Description = lvi.SubItems[(int)Column.Description].Text; } @@ -115,12 +120,14 @@ namespace TBF.UiControls { Config.FluentCommon.DeleteFromDb(session, entity); } - int itemNr = 0; + ToBeRemovedItems.Clear(); + int itemNr = 0; foreach (var entity in MyItems) { (entity as Procedure).ItemNr = itemNr++; Config.FluentCommon.SaveToDb(session, entity); } + session.Flush(); /// Update the column widths Program.LocalSettings.ProceduresColumnWidths = new int[Columns.Count]; @@ -185,12 +192,30 @@ namespace TBF.UiControls public new void RemoveSelected() { - bool lastOneRemoved = base.RemoveSelected(); - if (lastOneRemoved && parent != null) - { - parent.UpdateButtonStates(SharedButtons.SelectedItemPos.None); - } - } + if (MessageBox.Show(Strings.Do_you_want_to_delete_the_procedure, + Strings.Question, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + bool lastOneRemoved = base.RemoveSelected(); + + if (lastOneRemoved && parent != null) + { + parent.UpdateButtonStates(SharedButtons.SelectedItemPos.None); + } + + /// Update the database + foreach (var entity in ToBeRemovedItems) + { + Config.FluentCommon.DeleteFromDb(session, entity); + } + ToBeRemovedItems.Clear(); + int itemNr = 0; + foreach (var entity in MyItems) + { + (entity as Procedure).ItemNr = itemNr++; + Config.FluentCommon.SaveToDb(session, entity); + } + } + } public void editButton_Click(object sender, EventArgs e) {