From 921c524f0e8c9522848576735db9fec7aa1ce03d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 8 Oct 2018 09:36:13 +0200 Subject: [PATCH] Output.FileWriters.IperlLogger.Writer : Bug fixed, data of wm0 were logged for all water meters in the batch, ver. 2.18.1013 --- TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs | 4 ++-- TBF/BenchControl/Sequences/MainSeq.cs | 4 ++++ TBF/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs index 9fd4ba07d..6f815b9a7 100644 --- a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs @@ -280,9 +280,9 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger Results.Entities.MeterTestRslt[] wmtrs = new Results.Entities.MeterTestRslt[testInfos.Length]; for (int j = 0; j < testInfos.Length; j++) { - wmtrs[j] = wm0.GetMeterTestRslt(testInfos[j].TestName); + wmtrs[j] = wMtr.GetMeterTestRslt(testInfos[j].TestName); - if (wm0trs[j] == null && !string.IsNullOrEmpty(testInfos[j].TestName)) + if (wmtrs[j] == null && !string.IsNullOrEmpty(testInfos[j].TestName)) { testRsltIsMissing = true; /// Missing test result for one of specified tests } diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs index c6134c054..8462333d4 100644 --- a/TBF/BenchControl/Sequences/MainSeq.cs +++ b/TBF/BenchControl/Sequences/MainSeq.cs @@ -1513,6 +1513,10 @@ namespace TBF.BenchControl.Sequences { wm.CopyContentFrom(wm2); wm.Disabled = false; +#if ORACLE_DB + wm.WaterMeterData.WMTypeId = wm2.WaterMeterData.WMTypeId; + wm.WaterMeterData.WMTypeRev = wm2.WaterMeterData.WMTypeRev; +#endif break; } } diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 2e84e8209..813ee1dc8 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1012.0")] -[assembly: AssemblyFileVersion("2.18.1012.0")] +[assembly: AssemblyVersion("2.18.1013.0")] +[assembly: AssemblyFileVersion("2.18.1013.0")]