diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index 6afe2ce7b..a99cb2bc0 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -130,7 +130,9 @@ namespace Results.Entities public virtual MeterTestRslt GetMeterTestRslt(string testName, Config.Entities.CompoundMeterId meterId) { + if (string.IsNullOrEmpty(testName)) return null; if (Disabled) return null; + string testNameL = testName.ToLower(); foreach (var mtr in MeterTestRslts) { diff --git a/Results/ItemID.cs b/Results/ItemID.cs index df17bc3f7..7b34c1b38 100644 --- a/Results/ItemID.cs +++ b/Results/ItemID.cs @@ -134,7 +134,10 @@ namespace Results P_up_avg, /// 121 P_down_avg, /// 122 P_delta_avg, /// 123 - + + TestDone, /// 124 + TestPassed, /// 125 + Count, } } diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 1b9d6f4b6..a7137f81a 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.14.585.0")] -[assembly: AssemblyFileVersion("2.14.585.0")] +[assembly: AssemblyVersion("2.14.586.0")] +[assembly: AssemblyFileVersion("2.14.586.0")] diff --git a/Results/Resources/Strings.Designer.cs b/Results/Resources/Strings.Designer.cs index 5e6d8cf4e..b205fa532 100644 --- a/Results/Resources/Strings.Designer.cs +++ b/Results/Resources/Strings.Designer.cs @@ -429,6 +429,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to No. + /// + internal static string No { + get { + return ResourceManager.GetString("No", resourceCulture); + } + } + /// /// Looks up a localized string similar to OK. /// @@ -897,6 +906,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Test done. + /// + internal static string Test_done { + get { + return ResourceManager.GetString("Test_done", resourceCulture); + } + } + /// /// Looks up a localized string similar to Test ID. /// @@ -915,6 +933,15 @@ namespace Results.Resources { } } + /// + /// Looks up a localized string similar to Test passed. + /// + internal static string Test_passed { + get { + return ResourceManager.GetString("Test_passed", resourceCulture); + } + } + /// /// Looks up a localized string similar to Test vol.. /// @@ -1544,5 +1571,14 @@ namespace Results.Resources { return ResourceManager.GetString("Year", resourceCulture); } } + + /// + /// Looks up a localized string similar to Yes. + /// + internal static string Yes { + get { + return ResourceManager.GetString("Yes", resourceCulture); + } + } } } diff --git a/Results/Resources/Strings.it.resx b/Results/Resources/Strings.it.resx index 11e68f00e..b62819183 100644 --- a/Results/Resources/Strings.it.resx +++ b/Results/Resources/Strings.it.resx @@ -525,4 +525,16 @@ Temperatura sul deviatore alla fine del test + + Test terminato + + + Test OK + + + No + + + Sì + \ No newline at end of file diff --git a/Results/Resources/Strings.resx b/Results/Resources/Strings.resx index 4bfb2ed6b..51dac5d14 100644 --- a/Results/Resources/Strings.resx +++ b/Results/Resources/Strings.resx @@ -612,4 +612,16 @@ Ambient temperature during test + + Test done + + + Test passed + + + No + + + Yes + \ No newline at end of file diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index eded342b1..a27da1cfd 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -223,7 +223,7 @@ namespace Results #else AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : Config.Units.ConvertTo(u, w.GetMeterTestRslt(t).Error).ToString(string.IsNullOrEmpty(p) ? "F2" : p))); #endif - AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result + "()", Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr() : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr()))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr() : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr()))); /// /// Water meter info @@ -316,6 +316,8 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow, "iPerl Q2CorrLFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrLFlow.ToString()))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight, "iPerl Q2CorrFlowRight", Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrFlowRight.ToString()))); #endif + AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone, Strings.Test_done + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : (w.GetMeterTestRslt(t).TestDone ? Strings.Yes : Strings.No))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed, Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : (w.GetMeterTestRslt(t).Passed ? Strings.Yes : Strings.No))); } /// diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index a7bd5fd21..19107b0c1 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.14.585.1")] -[assembly: AssemblyFileVersion("2.14.585.1")] +[assembly: AssemblyVersion("2.14.586.1")] +[assembly: AssemblyFileVersion("2.14.586.1")]