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

Bug fixes : Ambient temperature, pressure, humidity calculation in Results.

Browse Source
This commit is contained in:
Milan Hanajik 2022-01-05 12:33:22 +01:00
parent 8e0417de9c
commit 15e5d65ee9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Results/Entities/Batch.cs
View File

@ -207,7 +207,7 @@ namespace Results.Entities
foreach (var tr in TestRslts)
{
if (tr.TestDone)
if (tr.TestDone && tr.AmbTempMean != 0)
{
double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
timeSum += duration;
@ -225,7 +225,7 @@ namespace Results.Entities
foreach (var tr in TestRslts)
{
if (tr.TestDone)
if (tr.TestDone && tr.AmbPressMean != 0)
{
double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
timeSum += duration;
@ -243,7 +243,7 @@ namespace Results.Entities
foreach (var tr in TestRslts)
{
if (tr.TestDone)
if (tr.TestDone && tr.AmbHumiMean != 0)
{
double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
timeSum += duration;
@ -258,7 +258,7 @@ namespace Results.Entities
{
for (int i = 0; i < TestRslts.Count; i++)
{
if (TestRslts[i].Publish() == Publish.Always)
if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbTempStart != 0)
return TestRslts[i].AmbTempStart;
}
return 0;
@ -267,7 +267,7 @@ namespace Results.Entities
{
for (int i = 0; i < TestRslts.Count; i++)
{
if (TestRslts[i].Publish() == Publish.Always)
if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbPressStart != 0)
return TestRslts[i].AmbPressStart;
}
return 0;
@ -276,7 +276,7 @@ namespace Results.Entities
{
for (int i = 0; i < TestRslts.Count; i++)
{
if (TestRslts[i].Publish() == Publish.Always)
if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbHumiStart != 0)
return TestRslts[i].AmbHumiStart;
}
return 0;
@ -284,27 +284,27 @@ namespace Results.Entities
public virtual double AmbTempEnd()
{
for (int i = TestRslts.Count - 1; i >= 0; i++)
for (int i = TestRslts.Count - 1; i >= 0; i--)
{
if (TestRslts[i].Publish() == Publish.Always)
if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbTempEnd != 0)
return TestRslts[i].AmbTempEnd;
}
return 0;
}
public virtual double AmbPressEnd()
{
for (int i = TestRslts.Count - 1; i >= 0; i++)
for (int i = TestRslts.Count - 1; i >= 0; i--)
{
if (TestRslts[i].Publish() == Publish.Always)
if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbPressEnd != 0)
return TestRslts[i].AmbPressEnd;
}
return 0;
}
public virtual double AmbHumiEnd()
{
for (int i = TestRslts.Count - 1; i >= 0; i++)
for (int i = TestRslts.Count - 1; i >= 0; i--)
{
if (TestRslts[i].Publish() == Publish.Always)
if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbHumiEnd != 0)
return TestRslts[i].AmbHumiEnd;
}
return 0;