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

iPerl : Pruefindex is compared with the max. allowed value only in case WM is Failed (either Pink or Magenta back color), ver. 2.18.1254

Browse Source
This commit is contained in:
Milan Hanajik
2019-06-25 18:24:09 +02:00
parent 4642abac2d
commit 096b649e40
7 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Entities/WaterMeter.cs
+4 -9
View File
@@ -478,8 +478,8 @@ namespace Results.Entities
static readonly System.Drawing.Color OkColor = System.Drawing.Color.LightGreen;
static readonly System.Drawing.Color NokColor = System.Drawing.Color.LightPink;
static readonly System.Drawing.Color RejectColor = System.Drawing.Color.Magenta;
static readonly System.Drawing.Color ProductionTracing = System.Drawing.Color.RoyalBlue;
static readonly System.Drawing.Color WrongDirection = System.Drawing.Color.Gold;
static readonly System.Drawing.Color ProductionErrorColor = System.Drawing.Color.RoyalBlue;
static readonly System.Drawing.Color WrongDirectionColor = System.Drawing.Color.Gold;
static readonly System.Drawing.Color WrongQ2FactorsColor = System.Drawing.Color.Red;
/// <summary>
@@ -496,23 +496,18 @@ namespace Results.Entities
if ((ErrorFlags & (int)ErrorFlagMask.E28) != 0)
{
message = Strings.Previous_step_is_missing_or_NOK;
return ProductionTracing;
return ProductionErrorColor;
}
else if ((ErrorFlags & (int)ErrorFlagMask.E27) != 0)
{
message = Strings.Wrong_iPerl_counting_direction;
return WrongDirection;
return WrongDirectionColor;
}
else if ((ErrorFlags & (int)ErrorFlagMask.E26) != 0)
{
message = Strings.Invalid_Q2_correction_factors;
return WrongQ2FactorsColor;
}
else if ((ErrorFlags & (int)ErrorFlagMask.E25) != 0)
{
message = Strings.Test_repetition_count_exceeded_upper_limit;
return RejectColor;
}
else if (wmtrPassed)
{
/// Water meter passed (therefore is was also completed)
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.1249.0")]
[assembly: AssemblyFileVersion("2.18.1249.0")]
[assembly: AssemblyVersion("2.18.1254.0")]
[assembly: AssemblyFileVersion("2.18.1254.0")]
TBF/BenchControl/Output/DB/SensusOracle/Database.cs
+2 -2
View File
@@ -595,9 +595,9 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
SaveBatchData(conn, batch);
foreach (var wMtr in batch.WaterMeters)
{
if ((wMtr.ErrorFlags & ((int)ErrorFlagMask.E25 | (int)ErrorFlagMask.E26 | (int)ErrorFlagMask.E27 | (int)ErrorFlagMask.E28)) == 0)
if ((wMtr.ErrorFlags & ((int)ErrorFlagMask.E26 | (int)ErrorFlagMask.E27 | (int)ErrorFlagMask.E28)) == 0)
{
/// No error production process error => write the result of testing to Oracle DB
/// No production error => write the result of testing to Oracle DB
SaveSingleWM2DB(conn, wMtr, safeMode);
}
}
TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs
+1 -1
View File
@@ -311,7 +311,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
{
Results.Entities.WaterMeter wMtr = batch.WaterMeters[i];
if ((wMtr == null) || (wMtr.ErrorFlags & ((int)ErrorFlagMask.E25 | (int)ErrorFlagMask.E26 | (int)ErrorFlagMask.E27 | (int)ErrorFlagMask.E28)) != 0)
if ((wMtr == null) || (wMtr.ErrorFlags & ((int)ErrorFlagMask.E26 | (int)ErrorFlagMask.E27 | (int)ErrorFlagMask.E28)) != 0)
{
logger.WriteLine();
logger.WriteLine(string.Format("[Zählerdaten_{0}]", wMtr.WMPosition));
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
retVal.Add(iPerlCommunicationForm.Write2HzCorrectionStr);
retVal.Add(string.Format("{0} if enabled", iPerlCommunicationForm.ReadConfigurationStr));
retVal.Add(string.Format("{0} 80", iPerlCommunicationForm.SetTestModeStr));
retVal.Add("iPerl_check pruefindex q2factors direction prevWorkStep");
retVal.Add("iPerl_check prevWorkStep direction q2factors");
}
else
{
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs
+1 -15
View File
@@ -1,14 +1,11 @@
///
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Text;
using log4net;
using Config.Entities;
using TBF.BenchControl;
using TBF.BenchControl.Sequences;
using TBF.Boxes;
using TBF.Resources;
using TBF.UiBridge;
@@ -131,17 +128,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
bool anyErrorOfThisMeter = false;
foreach (var arg in args)
{
#if ORACLE_DB
if (arg.ToLower() == "pruefindex")
{
if ((wm.Pruefindex % 100) > maxTestIndex)
{
anyErrorOfThisMeter = true;
message += string.Format("iPerl{0} : Príliš veľa opakovaní testu vodomera{1}", wm.WMPosition, Environment.NewLine);
errorIndicators |= (int)ErrorFlagMask.E25; /// Max pruefindex exceeded
}
}
#endif
#if TURA_SPECIAL
if (arg.ToLower() == "q2factors")
{
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.1252.0")]
[assembly: AssemblyFileVersion("2.18.1252.0")]
[assembly: AssemblyVersion("2.18.1254.0")]
[assembly: AssemblyFileVersion("2.18.1254.0")]