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

Output.SensusTestInfo : (1) S620_Kiwa, (2) CreateFromProcedure() fixed (as in 2.26.1622)

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-26 06:50:53 +02:00
parent 17c77758c6
commit 870b49d8ad
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Output/SensusTestInfo.cs
+11 -1
View File
@@ -26,6 +26,7 @@ namespace Results.Output
Greece, /// Q3, Q2adj, Q2, Q1 Greece, /// Q3, Q2adj, Q2, Q1
S620, /// Q3, Q100, Q2, Q1 S620, /// Q3, Q100, Q2, Q1
S620_Alt, /// Q3, Q100, Q2, Q1 S620_Alt, /// Q3, Q100, Q2, Q1
S620_Kiwa,
Count, Count,
None, None,
} }
@@ -447,6 +448,15 @@ namespace Results.Output
new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", 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) 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) public static SensusTestInfo CreateFromTest(Config.Entities.Test test, int repetitionNr, int luID, string fullTestNameWoPart)
Results/WMeterRsltItemSpec.cs
+2 -2
View File
@@ -444,8 +444,8 @@ namespace Results
#endif #endif
#if ORACLE_DB #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_AssignedSerialNr, "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_CompleteSerialNr, "Complete s/n", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.CompleteSerialNr)));
#endif #endif
#if TURA_SPECIAL #if TURA_SPECIAL