diff --git a/Results/Entities/Batch.cs b/Results/Entities/Batch.cs index ab0599931..1f5651e5e 100644 --- a/Results/Entities/Batch.cs +++ b/Results/Entities/Batch.cs @@ -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;