diff --git a/Results/Forms/MoreWMResultsDlg.cs b/Results/Forms/MoreWMResultsDlg.cs index 91cb5dfbc..bda644bbc 100644 --- a/Results/Forms/MoreWMResultsDlg.cs +++ b/Results/Forms/MoreWMResultsDlg.cs @@ -146,13 +146,13 @@ namespace Results.Forms tracingResultsListView.Items.Add(new ListViewItem(new string[] { rr.TimeStamp.ToString("dd.MM.yyyy HH:mm"), - rr.Workstep.Name, + (rr.Workstep != null) ? rr.Workstep.Name : string.Empty, rr.Workplace, rr.UserName, rr.Result == 0 ? "OK" : "NOK", - rr.Workstep.ReferencePart.Name, + (rr.Workstep != null && rr.Workstep.ReferencePart != null) ? rr.Workstep.ReferencePart.Name : string.Empty, rr.Code, - rr.Process.Name, + (rr.Process != null) ? rr.Process.Name : string.Empty, })); for (int i = 0; i < isMissing.Length; i++) diff --git a/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs b/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs index 500ff040d..068748e24 100644 --- a/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs +++ b/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs @@ -327,17 +327,20 @@ namespace TBF.UI.ResultsMI /// void OnDoubleClick(object sender, WaterMeterEventArgs args) { - int waterMetersCount = TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters.Count; - - WaterMeter wm; - if ((args.WMPosition <= 0) || (args.WMPosition > waterMetersCount) || - ((wm = TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters[args.WMPosition - 1]) == null)) + if (TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch != null && + TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters != null) { - MessageBox.Show(Strings.No_water_meter); - return; + foreach (var wm in TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters) + { + if (wm.WMPosition == args.WMPosition) + { + ShowMoreWMResults(wm); + return; + } + } } - ShowMoreWMResults(wm); + MessageBox.Show(Strings.No_water_meter); } @@ -567,7 +570,7 @@ namespace TBF.UI.ResultsMI /// foreach (var rec in refR.Records) { - if (rec.Part.OraDBType.ToLower().Contains("flowtube")) + if (!string.IsNullOrEmpty(rec.Part.OraDBType) && rec.Part.OraDBType.ToLower().Contains("flowtube")) { /// rec.Part is a flowtube /// @@ -576,6 +579,7 @@ namespace TBF.UI.ResultsMI .OrderBy(x => x.TimeStamp).Desc .List(); foreach (var rr in flowtubeRRs) refRecords.Add(rr); + break; } } }