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

Output.FileWriters.IperlLogger.Writer : Bug fixed, data of wm0 were logged for all water meters in the batch, ver. 2.18.1013

Browse Source
This commit is contained in:
Milan Hanajik
2018-10-08 11:00:18 +02:00
parent a8df9b50de
commit 921c524f0e
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs
+2 -2
View File
@@ -280,9 +280,9 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
Results.Entities.MeterTestRslt[] wmtrs = new Results.Entities.MeterTestRslt[testInfos.Length]; Results.Entities.MeterTestRslt[] wmtrs = new Results.Entities.MeterTestRslt[testInfos.Length];
for (int j = 0; j < testInfos.Length; j++) 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 testRsltIsMissing = true; /// Missing test result for one of specified tests
} }
TBF/BenchControl/Sequences/MainSeq.cs
+4
View File
@@ -1513,6 +1513,10 @@ namespace TBF.BenchControl.Sequences
{ {
wm.CopyContentFrom(wm2); wm.CopyContentFrom(wm2);
wm.Disabled = false; wm.Disabled = false;
#if ORACLE_DB
wm.WaterMeterData.WMTypeId = wm2.WaterMeterData.WMTypeId;
wm.WaterMeterData.WMTypeRev = wm2.WaterMeterData.WMTypeRev;
#endif
break; break;
} }
} }
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.18.1012.0")] [assembly: AssemblyVersion("2.18.1013.0")]
[assembly: AssemblyFileVersion("2.18.1012.0")] [assembly: AssemblyFileVersion("2.18.1013.0")]