From 2b0ee5590172da809cefa3dc7aab3b5fa5215ff5 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Thu, 19 Jan 2023 08:03:35 +0100
Subject: [PATCH] SensusOracle.Database bug fix : No attempt to read bemerkung
 from vt_wztyp_sd, ver. 2.31.2007

---
 TBF/Properties/AssemblyInfo.cs                       | 4 ++--
 TBF/Rig/Output/DB/SensusOracle/Database.cs           | 9 +++------
 TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs | 5 ++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 41e932308..788d23fce 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.31.2006.0")]
-[assembly: AssemblyFileVersion("2.31.2006.0")]
+[assembly: AssemblyVersion("2.31.2007.0")]
+[assembly: AssemblyFileVersion("2.31.2007.0")]
diff --git a/TBF/Rig/Output/DB/SensusOracle/Database.cs b/TBF/Rig/Output/DB/SensusOracle/Database.cs
index c25df1f27..7f05802aa 100644
--- a/TBF/Rig/Output/DB/SensusOracle/Database.cs
+++ b/TBF/Rig/Output/DB/SensusOracle/Database.cs
@@ -179,7 +179,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
         /// <param name="wmTypeId">Water meter type Id</param>
         /// <param name="wmTypeRevision">Water meter type revision</param>
         /// <returns>SensusTestInfos array</returns>
-        public IList<SensusTestInfo> GetOracleTestInfo(OracleConnection conn, int wmTypeId, out int wmTypeRevision, out string wzTyp, out string metrolKlasse, out string zulasszeichen, out string materialNr, out double q3, out DateTime timeStamp, out string remark)
+        public IList<SensusTestInfo> GetOracleTestInfo(OracleConnection conn, int wmTypeId, out int wmTypeRevision, out string wzTyp, out string metrolKlasse, out string zulasszeichen, out string materialNr, out double q3, out DateTime timeStamp)
         {
             ///
             /// Read 'incomplete' TestInfo from Oracle database containing only flowId-s ad qBezeichnung-s
@@ -196,9 +196,8 @@ namespace TBF.Rig.Output.DB.SensusOracle
             materialNr = string.Empty;
             q3 = 0;
             timeStamp = DateTime.MinValue;
-            remark = string.Empty;
 
-            OracleCommand cmd = new OracleCommand("SELECT rev_wztyp, wztyp, metrolklasse, zulasszeichen, materialnr, qmax, aenderungsdatum, bemerkung " +
+            OracleCommand cmd = new OracleCommand("SELECT rev_wztyp, wztyp, metrolklasse, zulasszeichen, materialnr, qmax, aenderungsdatum " +
                                                   "FROM vt_wztyp_sd " +
                                                   "WHERE anbid=:1 AND id_wztyp=:2 AND aktiv=:3", conn);
             cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
@@ -215,7 +214,6 @@ namespace TBF.Rig.Output.DB.SensusOracle
                 materialNr = dr.GetString(4);
                 q3 = dr.GetDouble(5);
                 timeStamp = dr.GetDateTime(6);
-                remark = dr.GetString(7);
             }
             dr.Close();
 
@@ -750,8 +748,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
                 string materialNr;
                 double q3 = 0;
                 DateTime timeStamp;
-                string remark;
-                IList<SensusTestInfo> ti = GetOracleTestInfo(conn, bat.WaterMeters[0].WaterMeterData.WMTypeId, out wmTR, out wzTypStr, out metroKlasse, out zulasszeichen, out materialNr, out q3, out timeStamp, out remark);
+                IList<SensusTestInfo> ti = GetOracleTestInfo(conn, bat.WaterMeters[0].WaterMeterData.WMTypeId, out wmTR, out wzTypStr, out metroKlasse, out zulasszeichen, out materialNr, out q3, out timeStamp);
 
                 if (ti != null)
                 {
diff --git a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
index 4448be6f9..2e3c0a659 100644
--- a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
@@ -218,13 +218,12 @@ namespace TBF.UI.Procedures.TestWizard
                 string wzTypStr;
                 string materialNr;
                 DateTime timeStamp;
-                string remark;
                 string testInfoName;
                 
                 OracleConnection conn = new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;");
                 conn.Open();
                 SelectedTestInfos = TBF.Rig.Sequences.ProcessData.OracleDB.GetOracleTestInfo(conn, WMTypeId,
-                    out wmTypeRevision, out wzTypStr, out MetrolKlasse, out Zulasszeichen, out materialNr, out Q3, out timeStamp, out remark);
+                    out wmTypeRevision, out wzTypStr, out MetrolKlasse, out Zulasszeichen, out materialNr, out Q3, out timeStamp);
                 conn.Close();
 
                 SensusTestInfo[] completeTestInfos = SensusTestInfo.GetBestMatch(SelectedTestInfos, wmTestNames, out testInfoName);
@@ -239,7 +238,7 @@ namespace TBF.UI.Procedures.TestWizard
                 metroClassTextBox.Text = MetrolKlasse;
                 approvalTextBox.Text = Zulasszeichen;
                 q3TextBox.Text = Q3.ToString();
-                remarkTextBox.Text = remark;
+                remarkTextBox.Text = "N/A";
                 timeStampTextBox.Text = timeStamp.ToString("dd.MM.yyyy HH:mm");
                 testInfoNameLabel.Text = testInfoName;