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

iPerl : "Fix' is possible for user 'milan' even when previous records are missing

Browse Source
This commit is contained in:
Milan Hanajik 2019-10-10 13:41:31 +02:00
parent b37023eff7
commit c95860dcce
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
TBF/BenchControl/Sequences/MainSeq.cs
View File

@ -523,10 +523,26 @@ namespace TBF.BenchControl.Sequences
for (int i = 0; i < BatchRslts.WaterMeters.Length; i++)
{
WaterMeter wm = BatchRslts.WaterMeters[i];
if (wm != null && wm.Passed)
if (wm != null)
{
/// Water meter passed and was already saved to Oracle, do not reload & fix it now
wm.Disabled = true;
if (wm.Passed)
{
/// Water meter passed and was already saved to Oracle, do not reload & fix it now
wm.Disabled = true;
}
else if (!wm.Disabled && Users.GlobalData.GetCurrentUserName() == "milan")
{
/// Water meter not passed and not disabled and user is 'milan' => reset flag E28
wm.ErrorFlags = wm.ErrorFlags & (~(int)ErrorFlagMask.E28);
foreach (var mtr in wm.MeterTestRslts)
{
if (mtr.TestData().Evaluate && (mtr.TestData().Name == "Kontrola montaze") && (mtr.TestData().Method == "iPerlCommunication"))
{
mtr.TestDone = true;
mtr.Passed = true;
}
}
}
}
}
}
@ -697,7 +713,7 @@ namespace TBF.BenchControl.Sequences
log.ErrorFormat("StartInfoReader failed to read data from the database");
/// TODO: Message for an operator? Error?
}
else if (selection == Selection.RestoreAndFixBatch)
else if ((selection == Selection.RestoreAndFixBatch) && (Users.GlobalData.GetCurrentUserName() != "milan"))
{
/// Restore and fix a batch - part 2
for (int i = 0; i < BatchRslts.WaterMeters.Length; i++)