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

Bug fix : Results.BatchResults.NewFromProcedure( ) uses GetTestInstances( ), ver. 3.1.1610

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-13 15:35:24 +02:00
parent 3603d31add
commit 5aec3c1ecc
2 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/BatchResults.cs
+30 -34
View File
@@ -100,45 +100,41 @@ namespace Results
} }
} }
foreach (var ti in procedure.GetTestInstances())
foreach (var t in procedure.Tests)
{ {
TestData td = TestData.UpdateList(d.TestDataList, new TestData(t)); TestData td = TestData.UpdateList(d.TestDataList, new TestData(ti.Test));
for (int rnr = 1; rnr <= t.Repeats; rnr++) /// Create an empty test result and add it to the list
TestRslt tr = new TestRslt(d.Batch, td, ti.Test.Part, ti.Repetition);
d.Batch.TestRslts.Add(tr);
for (int i = 0; i < d.WMPositionsCount; i++)
{ {
/// Create an empty test result and add it to the list if (!d.Batch.WaterMeters[i].Disabled && ti.Test.IsPartCompatible(waterMeterParts[i]))
TestRslt tr = new TestRslt(d.Batch, td, t.Part, rnr); {
d.Batch.TestRslts.Add(tr); ///
/// Create empty watermeter test results and add them to the list and to dictionaries
for (int i = 0; i < d.WMPositionsCount; i++) ///
{ IList<MeterTestRslt> wmtrs = d.Batch.WaterMeters[i].MeterTestRslts;
if (!d.Batch.WaterMeters[i].Disabled && t.IsPartCompatible(waterMeterParts[i])) if (d.Batch.Compound)
{ {
/// /// Compound water meter
/// Create empty watermeter test results and add them to the list and to dictionaries wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundMain));
/// wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundAux));
IList<MeterTestRslt> wmtrs = d.Batch.WaterMeters[i].MeterTestRslts; wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Compound));
if (d.Batch.Compound)
{
/// Compound water meter
wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundMain));
wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundAux));
wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Compound));
}
else if (d.Batch.HeatMeter)
{
/// Heat meter
wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterVolume));
wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterEnergy));
}
else
{
/// Water meter
wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Single));
}
} }
} else if (d.Batch.HeatMeter)
{
/// Heat meter
wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterVolume));
wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterEnergy));
}
else
{
/// Water meter
wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Single));
}
}
} }
} }
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("3.1.1606.0")] [assembly: AssemblyVersion("3.1.1610.0")]
[assembly: AssemblyFileVersion("3.1.1606.0")] [assembly: AssemblyFileVersion("3.1.1610.0")]