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

TestDone and TestPassed results items added, ver. 2.14.586

Browse Source
This commit is contained in:
Milan Hanajik 2017-06-23 12:37:10 +02:00
parent 3a3dc59275
commit 13ddcac646
8 changed files with 73 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Results/Entities/WaterMeter.cs
View File

@ -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)
{

5
Results/ItemID.cs
View File

@ -134,7 +134,10 @@ namespace Results
P_up_avg, /// 121
P_down_avg, /// 122
P_delta_avg, /// 123
TestDone, /// 124
TestPassed, /// 125
Count,
}
}

4
Results/Properties/AssemblyInfo.cs
View File

@ -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")]

36
Results/Resources/Strings.Designer.cs generated
View File

@ -429,6 +429,15 @@ namespace Results.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to No.
/// </summary>
internal static string No {
get {
return ResourceManager.GetString("No", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to OK.
/// </summary>
@ -897,6 +906,15 @@ namespace Results.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Test done.
/// </summary>
internal static string Test_done {
get {
return ResourceManager.GetString("Test_done", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Test ID.
/// </summary>
@ -915,6 +933,15 @@ namespace Results.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Test passed.
/// </summary>
internal static string Test_passed {
get {
return ResourceManager.GetString("Test_passed", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Test vol..
/// </summary>
@ -1544,5 +1571,14 @@ namespace Results.Resources {
return ResourceManager.GetString("Year", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Yes.
/// </summary>
internal static string Yes {
get {
return ResourceManager.GetString("Yes", resourceCulture);
}
}
}
}

12
Results/Resources/Strings.it.resx
View File

@ -525,4 +525,16 @@
<data name="Tooltip_T_di_en" xml:space="preserve">
<value>Temperatura sul deviatore alla fine del test </value>
</data>
<data name="Test_done" xml:space="preserve">
<value>Test terminato</value>
</data>
<data name="Test_passed" xml:space="preserve">
<value>Test OK</value>
</data>
<data name="No" xml:space="preserve">
<value>No</value>
</data>
<data name="Yes" xml:space="preserve">
<value>Sì</value>
</data>
</root>

12
Results/Resources/Strings.resx
View File

@ -612,4 +612,16 @@
<data name="Tooltip_T_Amb_M" xml:space="preserve">
<value>Ambient temperature during test</value>
</data>
<data name="Test_done" xml:space="preserve">
<value>Test done</value>
</data>
<data name="Test_passed" xml:space="preserve">
<value>Test passed</value>
</data>
<data name="No" xml:space="preserve">
<value>No</value>
</data>
<data name="Yes" xml:space="preserve">
<value>Yes</value>
</data>
</root>

4
Results/WMeterRsltItemSpec.cs
View File

@ -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)));
}
/// <summary>

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -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")]