From b17d71004477556a551f2e15982cacc26a7a7100 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 13 Apr 2018 11:40:51 +0200 Subject: [PATCH] Results.Entities.WaterMetrData.Medium added, woda zimna/goraca, ver. 2.18.876 --- Config/Entities/Enums.cs | 11 ++++++--- Config/Properties/AssemblyInfo.cs | 4 ++-- Results/Entities/TestRslt.cs | 7 +++++- Results/Entities/WaterMeter.cs | 11 +++++++++ Results/Entities/WaterMeterData.cs | 4 ++++ Results/ItemID.cs | 4 +++- .../OnePerMeter/OnePerMeterPrintDocument.cs | 24 +++++++++---------- Results/WMeterRsltItemSpec.cs | 3 ++- .../GenericDevices/IWaterMeter.cs | 2 ++ TBF/BenchControl/Sequences/MainSeq.cs | 2 +- .../WaterMeters/Munich/WaterMeter.cs | 2 ++ .../WaterMeters/WaterMeter/WaterMeter.cs | 2 +- 12 files changed, 54 insertions(+), 22 deletions(-) diff --git a/Config/Entities/Enums.cs b/Config/Entities/Enums.cs index 0a3448b89..44835473e 100644 --- a/Config/Entities/Enums.cs +++ b/Config/Entities/Enums.cs @@ -80,9 +80,14 @@ namespace Config.Entities public enum Medium { - [Description("")] NotSpecified, - ColdWater, - HotWater, + [Description("")] NotSpecified, +#if LANG_PL + [Description("Zimna")] ColdWater, + [Description("Gorąca")] HotWater, +#else + [Description("cold")] ColdWater, + [Description("hot")] HotWater, +#endif Count } diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 0e09aa7d8..47c896cb8 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.18.870.0")] -[assembly: AssemblyFileVersion("2.18.870.0")] +[assembly: AssemblyVersion("2.18.876.0")] +[assembly: AssemblyFileVersion("2.18.876.0")] diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index 00d053af4..089c01cf6 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -305,7 +305,12 @@ namespace Results.Entities /// Wrapper public virtual string ErrorFlagsStr() { - return Utils.ErrorFlagsStr(ErrorFlags); + string eFlags = Utils.ErrorFlagsStr(ErrorFlags); +#if LANG_PL + return string.IsNullOrEmpty(eFlags) ? "brak" : eFlags; +#else + return eFlags; +#endif } public override string ToString() diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index 41eb345af..10f85dc4e 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -145,6 +145,15 @@ namespace Results.Entities #endif } +#if LANG_PL + public virtual string PassedOrErrorFlagsStr() + { + ErrorFlagsMode errorFlagsMode; + string eFlags = Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode)); + return string.IsNullOrEmpty(eFlags) ? (WaterMeterData.Text4 + PassedColorStr()) : eFlags; + } +#endif + /// /// Convert failed tests and combined errorFlags of all tests to string /// @@ -208,6 +217,8 @@ namespace Results.Entities } + + /// /// Not mapped to the database /// diff --git a/Results/Entities/WaterMeterData.cs b/Results/Entities/WaterMeterData.cs index 55385c499..c70578b75 100644 --- a/Results/Entities/WaterMeterData.cs +++ b/Results/Entities/WaterMeterData.cs @@ -41,6 +41,8 @@ namespace Results.Entities public virtual string MetrologicalClassAux { get; set; } public virtual string ApprovalInfoAux { get; set; } + public virtual Config.Entities.Medium Medium { get; set; } + public virtual string Text1 { get; set; } public virtual string Text2 { get; set; } public virtual string Text3 { get; set; } @@ -96,6 +98,8 @@ namespace Results.Entities if (MetrologicalClassAux != wmd.MetrologicalClassAux) return false; if (ApprovalInfoAux != wmd.ApprovalInfoAux) return false; + if (Medium != wmd.Medium) return false; + if (Text1 != wmd.Text1) return false; if (Text2 != wmd.Text2) return false; if (Text3 != wmd.Text3) return false; diff --git a/Results/ItemID.cs b/Results/ItemID.cs index 89944d0c3..7731dfe7e 100644 --- a/Results/ItemID.cs +++ b/Results/ItemID.cs @@ -241,7 +241,9 @@ namespace Results P_delta_mean_from_up_down_per_mtr, /// 209 Timestamp_start, /// 210 Timestamp_end, /// 211 - P_PMax_test_mean, /// 212 PMax test pressure mean of (Pup + Pdown)/2 + P_PMax_test_mean, /// 212 PMax test pressure mean of (Pup + Pdown)/2 + + Medium, /// 213 Woda zimna/tepla Count, } diff --git a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs index 814049766..4aff98d31 100644 --- a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs +++ b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs @@ -193,27 +193,27 @@ namespace Results.Output.Printers.OnePerMeter TableStyle commonTableStyle = new TableStyle { Font = font, MarginX = 5, MarginY = 3 }; Table table1 = new Table(2) { Style = commonTableStyle }; - foreach (var v in commonItems1) + foreach (var item in commonItems1) { - string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty }; + string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty }; table1.AddRow(row, horizAlgn, vertAlgn); } float bodyTop1 = table1.Draw(e, leftMarginCommon1, commonTop); table1 = new Table(2) { Style = commonTableStyle }; - foreach (var v in commonItems2) + foreach (var item in commonItems2) { - string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty }; + string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty }; table1.AddRow(row, horizAlgn, vertAlgn); } float bodyTop2 = table1.Draw(e, leftMarginCommon2, commonTop); table1 = new Table(2) { Style = commonTableStyle }; - foreach (var v in commonItems3) + foreach (var item in commonItems3) { - string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty }; + string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty }; table1.AddRow(row, horizAlgn, vertAlgn); } float bodyTop3 = table1.Draw(e, leftMarginCommon3, commonTop); @@ -301,27 +301,27 @@ namespace Results.Output.Printers.OnePerMeter TableStyle commonTableStyle = new TableStyle { Font = font, MarginX = 5, MarginY = 3 }; Table table2 = new Table(2) { Style = commonTableStyle }; - foreach (var v in belowItems1) + foreach (var item in belowItems1) { - string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty }; + string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty }; table2.AddRow(row, horizAlgn, vertAlgn); } table2.Draw(e, leftMarginBelow1, belowTop); table2 = new Table(2) { Style = commonTableStyle }; - foreach (var v in belowItems2) + foreach (var item in belowItems2) { - string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty }; + string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty }; table2.AddRow(row, horizAlgn, vertAlgn); } table2.Draw(e, leftMarginBelow2, belowTop); table2 = new Table(2) { Style = commonTableStyle }; - foreach (var v in belowItems3) + foreach (var item in belowItems3) { - string[] row = new string[] { v.Caption, (batch.WaterMeters.Count > 0) ? v.Print(batch.WaterMeters[0]) : string.Empty }; + string[] row = new string[] { item.Caption, (batch.WaterMeters.Count > 0) ? item.Print(batch.WaterMeters[0]).Split(new char[] { '|' })[0] : string.Empty }; table2.AddRow(row, horizAlgn, vertAlgn); } table2.Draw(e, leftMarginBelow3, belowTop); diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index c53a7e3e4..93df91cb7 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -305,7 +305,7 @@ namespace Results #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.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, string.IsNullOrEmpty(w.ErrorFlagsStr()) ? (w.WaterMeterData.Text4 + w.PassedColorStr()) : w.ErrorFlagsStr()))); /// PL specific result + AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr()))); /// PL specific result /// /// Water meter info @@ -328,6 +328,7 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.Flow_profile_sensitivity_class, "Flow profile sensitivity class", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.FlowProfileSensitivityClass.ToDescription()))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Approval_info, Strings.Approval, Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.ApprovalInfo))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Certificate, "Certificate", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Certificate))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.Medium, "Water cold/hot", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Medium.ToDescription()))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Text1, "Text1", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text1))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Text2, "Text2", Quantity.String, ItemCategory.MeterData, (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Text2))); diff --git a/TBF/BenchControl/GenericDevices/IWaterMeter.cs b/TBF/BenchControl/GenericDevices/IWaterMeter.cs index c07298307..df515a1fe 100644 --- a/TBF/BenchControl/GenericDevices/IWaterMeter.cs +++ b/TBF/BenchControl/GenericDevices/IWaterMeter.cs @@ -34,6 +34,8 @@ namespace TBF.BenchControl.GenericDevices double PulsesPerLtr { get; } + Medium Medium { get; } + string Text1 { get; } string Text2 { get; } string Text3 { get; } diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs index d2bdc36fe..8ae2d8f0c 100644 --- a/TBF/BenchControl/Sequences/MainSeq.cs +++ b/TBF/BenchControl/Sequences/MainSeq.cs @@ -1381,7 +1381,7 @@ namespace TBF.BenchControl.Sequences Certificate = WaterMeters[ix].Certificate, PulsesPerLtr = WaterMeters[ix].PulsesPerLtr, - + Medium = WaterMeters[ix].Medium, Text1 = WaterMeters[ix].Text1, Text2 = WaterMeters[ix].Text2, Text3 = WaterMeters[ix].Text3, diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs index 46fe1540a..d60008959 100644 --- a/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs +++ b/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs @@ -51,6 +51,8 @@ namespace TBF.BenchControl.WaterMeters.Munich public string ApprovalInfo { get { return waterMeterCfg.ProcParams.ApprovalInfo; } } public string Certificate { get { return string.Empty; } } + public Medium Medium { get { return Medium.ColdWater; } } + public string Text1 { get { return string.Empty; } } public string Text2 { get { return string.Empty; } } public string Text3 { get { return string.Empty; } } diff --git a/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs index 43a33cb23..5f79b7996 100644 --- a/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs +++ b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs @@ -55,7 +55,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter public string Text5 { get { return waterMeterCfg.ProcParams.Text5; } } /// Water: cold / hot - public Config.Entities.Medium WaterTemp { get { return waterMeterCfg.ProcParams.WaterTemp; } } + public Config.Entities.Medium Medium { get { return waterMeterCfg.ProcParams.WaterTemp; } } #if IPERL public ushort OriginalCalibFactor;