From 870b49d8ad7d8b3c486ad173f2abcc15c4825317 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Mon, 26 Apr 2021 06:50:53 +0200
Subject: [PATCH] Output.SensusTestInfo : (1) S620_Kiwa, (2)
 CreateFromProcedure() fixed (as in 2.26.1622)

---
 Results/Output/SensusTestInfo.cs | 12 +++++++++++-
 Results/WMeterRsltItemSpec.cs    |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Results/Output/SensusTestInfo.cs b/Results/Output/SensusTestInfo.cs
index fdeebe9a9..f396ac340 100644
--- a/Results/Output/SensusTestInfo.cs
+++ b/Results/Output/SensusTestInfo.cs
@@ -26,6 +26,7 @@ namespace Results.Output
         Greece,                 /// Q3, Q2adj, Q2, Q1
         S620,                   /// Q3, Q100, Q2, Q1
         S620_Alt,               /// Q3, Q100, Q2, Q1
+        S620_Kiwa,
         Count,
         None,
     }
@@ -447,6 +448,15 @@ namespace Results.Output
                         new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
+
+                case LogType.S620_Kiwa:
+                    return new SensusTestInfo[]
+                    {
+                        ///                TBF           Oracle DB    Opto RAW   LU logfiles 
+                        new SensusTestInfo("Q4",          5,    "Q4",   5, "04",   5,   "Q4", Range.R90_100),
+                        new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
+                        new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
+                    };
             }
         }
 
@@ -505,7 +515,7 @@ namespace Results.Output
         /// 
         static bool TestShouldBeIncluded(Config.Entities.Test test)
         {
-            return test.DoEvaluate && !test.Method.ToLower().Contains("iperlcommunication");
+            return test.DoEvaluate && test.IsRegular() && !test.Method.ToLower().Contains("iperlcommunication");
         }
         /// 
         public static SensusTestInfo CreateFromTest(Config.Entities.Test test, int repetitionNr, int luID, string fullTestNameWoPart)
diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs
index 0c770b223..2fe94863d 100644
--- a/Results/WMeterRsltItemSpec.cs
+++ b/Results/WMeterRsltItemSpec.cs
@@ -444,8 +444,8 @@ namespace Results
 #endif
 
 #if ORACLE_DB
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_AssignedSerialNr, "iPerl assigned s/n", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.AssignedSerialNr)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_CompleteSerialNr, "iPerl complete s/n", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.CompleteSerialNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_AssignedSerialNr, "Assigned s/n",        Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => FormatInt(f, w.AssignedSerialNr)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Prod_CompleteSerialNr, "Complete s/n",        Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.CompleteSerialNr)));
 #endif
 
 #if TURA_SPECIAL