diff --git a/Results/Entities/MeterTestRslt.cs b/Results/Entities/MeterTestRslt.cs index 76ae687fc..985492a7c 100644 --- a/Results/Entities/MeterTestRslt.cs +++ b/Results/Entities/MeterTestRslt.cs @@ -65,6 +65,13 @@ namespace Results.Entities public virtual WaterMeterData WaterMeterData() { return WaterMeter.WaterMeterData; } public virtual Batch Batch() { return WaterMeter.Batch; } + public virtual bool IsPilotRslt() + { + return (CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Single) || + (CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Compound) || + (CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy); + } + public virtual string PassedColorStr() { #if PUCHONG_PT200 diff --git a/Results/Forms/BatchResultsDlg.cs b/Results/Forms/BatchResultsDlg.cs index 5b0b7e26e..3c420573a 100644 --- a/Results/Forms/BatchResultsDlg.cs +++ b/Results/Forms/BatchResultsDlg.cs @@ -209,10 +209,8 @@ namespace Results.Forms foreach (var mtr in wMtr.MeterTestRslts) { - if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound) - && mtr.TestDone - && (mtr.Publish() != Config.Entities.Publish.Never) - && (mtr.Publish() != Config.Entities.Publish.Internal)) + if (mtr.IsPilotRslt() && mtr.TestDone && (mtr.Publish() != Config.Entities.Publish.Never) + && (mtr.Publish() != Config.Entities.Publish.Internal)) { testNames.Add(mtr.Name()); } @@ -251,13 +249,8 @@ namespace Results.Forms int ix = 0; foreach (var mtr in wMtr.MeterTestRslts) { - if (mtr != null && - (mtr.CompoundMeterId == (byte)CompoundMeterId.Single || - mtr.CompoundMeterId == (byte)CompoundMeterId.Compound || - mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy) && - mtr.TestDone && - mtr.Publish() != Config.Entities.Publish.Never && - mtr.Publish() != Config.Entities.Publish.Internal) + if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never + && mtr.Publish() != Config.Entities.Publish.Internal) { ListViewItem lvi = new ListViewItem(testNames[ix++]); @@ -322,13 +315,8 @@ namespace Results.Forms foreach (var mtr in wMtr.MeterTestRslts) { - if (mtr != null && - (mtr.CompoundMeterId == (byte)CompoundMeterId.Single || - mtr.CompoundMeterId == (byte)CompoundMeterId.Compound || - mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy) && - mtr.TestDone && - mtr.Publish() != Config.Entities.Publish.Never && - mtr.Publish() != Config.Entities.Publish.Internal) + if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never && + mtr.Publish() != Config.Entities.Publish.Internal) { string str = items[i].Print(wMtr, mtr.Name()); diff --git a/Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs b/Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs index 9ace759fc..d2f3c30f5 100644 --- a/Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs +++ b/Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs @@ -252,7 +252,7 @@ namespace Results.Output.Printers.Enhanced float columnWidth = e.Graphics.MeasureString(testItems[i].Caption, font).Width; foreach (var mtr in wm.MeterTestRslts) { - if ((mtr != null) && (mtr.Publish() == Config.Entities.Publish.Always)) + if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) { string itemText = testItems[i].Print(wm, mtr.Name()); diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs b/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs index fb86ef63e..140413a38 100644 --- a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs +++ b/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs @@ -402,7 +402,7 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced { if (abort) return; - if ((mtr != null) && (mtr.Publish() == Config.Entities.Publish.Always)) + if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) { for (int i = 0; i < testItems.Count; i++) {