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

ResultsTabPageCtrl : iPerl is rejected also when proefindex==limit and it failed the test, ver. 2.18.1163

Browse Source
This commit is contained in:
Milan Hanajik
2019-03-13 08:50:43 +01:00
parent 70cba76ffd
commit 3e54204a17
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.18.1162.0")] [assembly: AssemblyVersion("2.18.1163.0")]
[assembly: AssemblyFileVersion("2.18.1162.0")] [assembly: AssemblyFileVersion("2.18.1163.0")]
TBF/Screens/ResultsTabPageCtrl.cs
+12
View File
@@ -374,9 +374,21 @@ namespace TBF.Screens
else if (wmtrCompleted) else if (wmtrCompleted)
{ {
/// Water meter was completed but did not pass => Failed /// Water meter was completed but did not pass => Failed
#if ORACLE_DB
if ((TBF.BenchControl.Sequences.ProcessData.BenchInfo is TBF.BenchControl.BenchInfo.iPerl.Component) &&
wMtr.Pruefindex >= (TBF.BenchControl.Sequences.ProcessData.BenchInfo as TBF.BenchControl.BenchInfo.iPerl.Component).MaxTestIndex)
{
/// Proefindex reached the limit => Proefindex would be above this limit next time => Reject
message = Strings.Test_repetition_count_exceeded_upper_limit;
return RejectColor;
}
else
#endif
{
message = Strings.Failed; message = Strings.Failed;
return NokColor; return NokColor;
} }
}
else else
{ {
/// Water meter was not completed yet => did not pass, did not fail /// Water meter was not completed yet => did not pass, did not fail