From 0c5003be7bcc1c36c4c59a633810ffe01d4761cc Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 5 Jun 2019 09:42:13 +0200 Subject: [PATCH] Results.Entities.TestRslt.IsVolumeMethod( ) fixed, ver. 2.18.1241 --- Results/Entities/TestRslt.cs | 6 +++--- Results/Properties/AssemblyInfo.cs | 4 ++-- TBF/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index 35bc26268..2364b9455 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -15,8 +15,8 @@ namespace Results.Entities public virtual TestData TestData { get; set; } public virtual Components Components { get; set; } public virtual int Part { get; set; } - public virtual int RepetitionNr { get; set; } /// Repetition number from the set of repeated tests (1...) - public virtual string MethodClass { get; set; } /// Not mapped to the DB, does not depent on localisation and customer + public virtual int RepetitionNr { get; set; } /// Repetition number from the set of repeated tests (1...) + public virtual string MethodClass { get; set; } /// Not mapped to DB, does not depend on localization and customer /// Main results public virtual bool TestDone { get; set; } @@ -139,7 +139,7 @@ namespace Results.Entities public virtual bool IsPMaxTest() { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest")) : true; } public virtual bool IsStartStop() { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; } public virtual bool IsDiverter() { return (MethodClass != null) ? (MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) : true; } - public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart")) : false; } + public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; } public virtual string MethodElde() { diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index e361dc96e..a3f10f3ac 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -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.1240.0")] -[assembly: AssemblyFileVersion("2.18.1240.0")] +[assembly: AssemblyVersion("2.18.1241.0")] +[assembly: AssemblyFileVersion("2.18.1241.0")] diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index b7d8e9032..b7d4a0cdc 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1240.0")] -[assembly: AssemblyFileVersion("2.18.1240.0")] +[assembly: AssemblyVersion("2.18.1241.0")] +[assembly: AssemblyFileVersion("2.18.1241.0")]