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

Displaying production tracing records fixed.

Browse Source
This commit is contained in:
Milan Hanajik
2020-02-12 09:46:37 +01:00
parent e28b94c367
commit 98aa74a0d4
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Forms/MoreWMResultsDlg.cs
+3 -3
View File
@@ -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++)
TBF/UI/ResultsMI/ResultsTabPageCtrl.cs
+13 -9
View File
@@ -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;
}
}
}