From 31fc49485ac1de0cf04f185ef11eca022342231b Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 24 Aug 2015 09:33:13 +0200 Subject: [PATCH] More DataEntry.iPerl changes, Oracle DB uses testResult.PurchaseOrder, opto-data logging creates ProcessData folder correctly. --- .../BenchControl/DB/SensusOracle/Database.cs | 3 +- .../BenchControl/DataEntry/iPerl/EntryForm.cs | 43 ------------------- .../DataEntry/iPerl/EntryFormCfg.cs | 2 +- .../DataEntry/iPerl/EntryFormFactory.cs | 2 +- .../BenchControl/TbfComponents.cs | 3 +- .../WaterMeters/iPerl/WaterMeter.cs | 4 +- 6 files changed, 9 insertions(+), 48 deletions(-) diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs index 1737b04d2..992ee5fe7 100644 --- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs +++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs @@ -358,9 +358,10 @@ namespace TBF.BenchControl.DB.SensusOracle if (passed) { + string pOrder = string.IsNullOrEmpty(unsortedResults[0].PurchaseOrder) ? string.Empty : unsortedResults[0].PurchaseOrder; OracleParameter parm1 = new OracleParameter(); parm1.OracleDbType = OracleDbType.Varchar2; - parm1.Value = "BBAATMXX"; + parm1.Value = pOrder; OracleParameter parm2 = new OracleParameter(); parm2.OracleDbType = OracleDbType.Varchar2; diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs index af99538d4..8d7a902cb 100644 --- a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs @@ -186,52 +186,16 @@ namespace TBF.BenchControl.DataEntry.iPerl if (dlg != null) { purchaseOrder = dlg.PurchaseOrder; - - for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++) - { - if (waterMeters[i] != null) - { - serialNr[i] = waterMeters[i].SerialNr = dlg.SNText[i]; - disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i]; - } - } } } else if (currentOp == CurrentOp.ShowFormAtCycleEnd) { - CycleEndForm dlg = (modelessDlg as CycleEndForm); - int count = waterMeters.Count; - if ((dlg != null) && (count > dlg.WaterMetersCount)) count = dlg.WaterMetersCount; - - for (int i = 0; i < count; i++) - { - if (waterMeters[i] != null) - { - /// In case entryFormCfg.ShowCycleEndForm == false dlg would be null, values would be string.Empty - wmCycleEndState[i] = waterMeters[i].EndState = (dlg != null) ? dlg.EndStateText[i] : string.Empty; - } - } } else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates) { - /// Fixed start test - start - TestStartEndForm dlg = (modelessDlg as TestStartEndForm); - - for (int i = 0; i < dlg.WaterMetersCount; i++) - { - wmStartState[i] = dlg.WMStartState[i]; - wmStartStateStr[i] = dlg.WMStartStateStr[i]; - } } else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestEndStates) { - /// Fixed start test - end - TestStartEndForm dlg = (modelessDlg as TestStartEndForm); - - for (int i = 0; i < dlg.WaterMetersCount; i++) - { - wmEndState[i] = dlg.WMEndState[i]; - } } resultSaved = true; modelessDlg = null; @@ -263,13 +227,6 @@ namespace TBF.BenchControl.DataEntry.iPerl if (testRslt.MetersKind != Entities.MetersKind.Single) continue; testRslt.PurchaseOrder = PurchaseOrder; - - for (int i = 0; i < testRslt.Meters.Count; i++) - { - testRslt.Meters[i].SerialNr = SerialNr(i); - testRslt.Meters[i].Disabled = Disabled(i); - testRslt.Meters[i].EndState = WMCycleEndState(i); - } } } } diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfg.cs b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfg.cs index f6d8c0bb0..cd4ca2b8e 100644 --- a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfg.cs +++ b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfg.cs @@ -22,7 +22,7 @@ namespace TBF.BenchControl.DataEntry.iPerl /// Private parameterless constructor invoked by all other (public) constructors EntryFormCfg() { - Name = "DataEntry-Standard-24"; + Name = "DataEntry-iPerl"; ParentName = string.Empty; ShowCycleEndForm = false; } diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormFactory.cs index e1d91f3ec..98e8cad4d 100644 --- a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormFactory.cs +++ b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormFactory.cs @@ -7,7 +7,7 @@ namespace TBF.BenchControl.DataEntry.iPerl { public class EntryFormFactory : IComponentFactory { - public string ClassName { get { return "DataEntry-Standard-24"; } } + public string ClassName { get { return "DataEntry-iPerl"; } } public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs index 62f6235c6..b9a447b0f 100644 --- a/TestBenchFramework/BenchControl/TbfComponents.cs +++ b/TestBenchFramework/BenchControl/TbfComponents.cs @@ -28,7 +28,8 @@ namespace TBF.BenchControl Factories.Add(new DataEntry.Munich3.EntryFormFactory()); Factories.Add(new DataEntry.Munich.EntryFormFactory()); #endif - Factories.Add(new DataEntry.Standard.EntryFormFactory()); + Factories.Add(new DataEntry.iPerl.EntryFormFactory()); + Factories.Add(new DataEntry.Standard.EntryFormFactory()); Factories.Add(new DataEntry.Standard24.EntryFormFactory()); Factories.Add(new Elde.Diverter.DiverterFactory()); Factories.Add(new TestMethods.FixedStartCombinedMeters.TestMethodFactory()); diff --git a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs index 9cb128492..370e02d51 100644 --- a/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs +++ b/TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs @@ -412,7 +412,9 @@ namespace TBF.BenchControl.WaterMeters.iPerl void SaveOptoData() { - TextWriter optoLogFile = new StreamWriter("C:\\TBF\\ProcessData\\" + optoDataLogFileName + ".txt"); + string directory = "C:\\TBF\\ProcessData\\"; /// TODO: determine correct relative path + Directory.CreateDirectory(directory); + TextWriter optoLogFile = new StreamWriter(directory + optoDataLogFileName + ".txt"); for (int i = 0; i < optoDataCount; i++) optoLogFile.WriteLine(optoData[i].ToString()); optoLogFile.Close(); }