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-06 08:00:06 +01:00
parent 1b767f6298
commit 6071d7f598
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Entities/Batch.cs
+12 -12
View File
@@ -208,7 +208,7 @@ namespace Results.Entities
foreach (var tr in TestRslts) foreach (var tr in TestRslts)
{ {
if (tr.TestDone) if (tr.TestDone && tr.AmbTempMean != 0)
{ {
double duration = (tr.EndTime - tr.StartTime).TotalSeconds; double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
timeSum += duration; timeSum += duration;
@@ -226,7 +226,7 @@ namespace Results.Entities
foreach (var tr in TestRslts) foreach (var tr in TestRslts)
{ {
if (tr.TestDone) if (tr.TestDone && tr.AmbPressMean != 0)
{ {
double duration = (tr.EndTime - tr.StartTime).TotalSeconds; double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
timeSum += duration; timeSum += duration;
@@ -244,7 +244,7 @@ namespace Results.Entities
foreach (var tr in TestRslts) foreach (var tr in TestRslts)
{ {
if (tr.TestDone) if (tr.TestDone && tr.AmbHumiMean != 0)
{ {
double duration = (tr.EndTime - tr.StartTime).TotalSeconds; double duration = (tr.EndTime - tr.StartTime).TotalSeconds;
timeSum += duration; timeSum += duration;
@@ -259,7 +259,7 @@ namespace Results.Entities
{ {
for (int i = 0; i < TestRslts.Count; i++) for (int i = 0; i < TestRslts.Count; i++)
{ {
if (TestRslts[i].Publish() == Common.Publish.Always) if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbTempStart != 0)
return TestRslts[i].AmbTempStart; return TestRslts[i].AmbTempStart;
} }
return 0; return 0;
@@ -268,7 +268,7 @@ namespace Results.Entities
{ {
for (int i = 0; i < TestRslts.Count; i++) for (int i = 0; i < TestRslts.Count; i++)
{ {
if (TestRslts[i].Publish() == Common.Publish.Always) if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbPressStart != 0)
return TestRslts[i].AmbPressStart; return TestRslts[i].AmbPressStart;
} }
return 0; return 0;
@@ -277,7 +277,7 @@ namespace Results.Entities
{ {
for (int i = 0; i < TestRslts.Count; i++) for (int i = 0; i < TestRslts.Count; i++)
{ {
if (TestRslts[i].Publish() == Common.Publish.Always) if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbHumiStart != 0)
return TestRslts[i].AmbHumiStart; return TestRslts[i].AmbHumiStart;
} }
return 0; return 0;
@@ -285,27 +285,27 @@ namespace Results.Entities
public virtual double AmbTempEnd() 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() == Common.Publish.Always) if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbTempEnd != 0)
return TestRslts[i].AmbTempEnd; return TestRslts[i].AmbTempEnd;
} }
return 0; return 0;
} }
public virtual double AmbPressEnd() 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() == Common.Publish.Always) if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbPressEnd != 0)
return TestRslts[i].AmbPressEnd; return TestRslts[i].AmbPressEnd;
} }
return 0; return 0;
} }
public virtual double AmbHumiEnd() 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() == Common.Publish.Always) if (TestRslts[i].Publish() == Common.Publish.Always && TestRslts[i].AmbHumiEnd != 0)
return TestRslts[i].AmbHumiEnd; return TestRslts[i].AmbHumiEnd;
} }
return 0; return 0;