From 3c51b92e5e2e1fe46b624e0b41ce158e9713fd6e Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 8 Mar 2017 10:35:08 +0100 Subject: [PATCH] Serious bug in saving/printing results for compound meters fixed, ver. 2.12.486 --- Config/Entities/Enums.cs | 1 + Config/Properties/AssemblyInfo.cs | 4 ++-- Results/Entities/WaterMeter.cs | 19 ++++++++++++++++--- Results/Properties/AssemblyInfo.cs | 4 ++-- ResultsBrowser/Properties/AssemblyInfo.cs | 4 ++-- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Config/Entities/Enums.cs b/Config/Entities/Enums.cs index d737753d9..710d06fc3 100644 --- a/Config/Entities/Enums.cs +++ b/Config/Entities/Enums.cs @@ -78,6 +78,7 @@ namespace Config.Entities Compound, HeatMeterVolume, HeatMeterEnergy, + SingleOrCompound, /// Only used when querying results } public enum Medium diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 1330d4676..d704f3b09 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.12.475.0")] -[assembly: AssemblyFileVersion("2.12.475.0")] +[assembly: AssemblyVersion("2.12.486.0")] +[assembly: AssemblyFileVersion("2.12.486.0")] diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index 3b4c314e0..6e610bf54 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -92,7 +92,7 @@ namespace Results.Entities public virtual MeterTestRslt GetMeterTestRslt(string testName) { - return GetMeterTestRslt(testName, CompoundMeterId.Single); + return GetMeterTestRslt(testName, CompoundMeterId.SingleOrCompound); } public virtual MeterTestRslt GetMeterTestRslt(string testName, Config.Entities.CompoundMeterId meterId) @@ -101,9 +101,22 @@ namespace Results.Entities string testNameL = testName.ToLower(); foreach (var mtr in MeterTestRslts) { - if ((mtr.CompoundMeterId == (byte)meterId) && mtr.Name().ToLower().Equals(testNameL)) + if (mtr.Name().ToLower().Equals(testNameL)) { - return mtr; + if (mtr.CompoundMeterId == (byte)meterId) + { + return mtr; + } + else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound && + mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Single) + { + return mtr; + } + else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound && + mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Compound) + { + return mtr; + } } } return null; diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 6dbc29c08..e9752d822 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.12.475.0")] -[assembly: AssemblyFileVersion("2.12.475.0")] +[assembly: AssemblyVersion("2.12.486.0")] +[assembly: AssemblyFileVersion("2.12.486.0")] diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index fb4fe30e2..b8414493f 100644 --- a/ResultsBrowser/Properties/AssemblyInfo.cs +++ b/ResultsBrowser/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.12.485.0")] -[assembly: AssemblyFileVersion("2.12.485.0")] +[assembly: AssemblyVersion("2.12.486.0")] +[assembly: AssemblyFileVersion("2.12.486.0")] diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index e43a636d5..5135e2c31 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.12.485.1")] -[assembly: AssemblyFileVersion("2.12.485.1")] +[assembly: AssemblyVersion("2.12.486.1")] +[assembly: AssemblyFileVersion("2.12.486.1")]