diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs index 1da3e3e1c..0fa16a8c9 100644 --- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs +++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs @@ -1017,7 +1017,7 @@ namespace TBF.BenchControl.DB.SensusOracle parm.OracleDbType = OracleDbType.Varchar2; parm.Value = wm.SerialNr; - OracleCommand cmd1 = new OracleCommand("SELECT MAX_Pruefindex FROM VT_ZAEHLER_PD WHERE VT_Fernum = :1 AND ANBID = 4", conn); + OracleCommand cmd1 = new OracleCommand("SELECT Pruefindex FROM VT_ZAEHLER_PINDEX_PD WHERE VT_Fernum = :1 AND ANBID = 4", conn); cmd1.Parameters.Add(parm); OracleDataReader dr = cmd1.ExecuteReader(); @@ -1144,7 +1144,7 @@ namespace TBF.BenchControl.DB.SensusOracle " VALUES (:1, :2, :3, :4, :5, :6, 0, 0, 0, :7, 0, :8, 0, :9, :10, :11, :12)", conn); OracleParameter parm; parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); - parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex % 100; cmd.Parameters.Add(parm); + parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); parm = new OracleParameter("ID_Pruefstand", OracleDbType.Int32); parm.Value = 18000 + wm.Batch.TestBenchId; cmd.Parameters.Add(parm); parm = new OracleParameter("ID_WzPruefreihe", OracleDbType.Int32); parm.Value = wm.Batch.BatchNr; cmd.Parameters.Add(parm); @@ -1214,7 +1214,7 @@ namespace TBF.BenchControl.DB.SensusOracle " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, 0, 0, 0, :14, 0, 0)", conn); OracleParameter parm; parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = mtr.WaterMeter.SerialNr; cmd.Parameters.Add(parm); ///:1 - parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex % 100; cmd.Parameters.Add(parm); ///:2 + parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); ///:2 parm = new OracleParameter("PruefungsNr", OracleDbType.Int32); parm.Value = qq; cmd.Parameters.Add(parm); ///:3 parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:4 parm = new OracleParameter("ID_WZTyp", OracleDbType.Int32); parm.Value = mtr.WaterMeter.WaterMeterData.WMTypeId; cmd.Parameters.Add(parm); ///:5 diff --git a/TestBenchFramework/Forms/PreviousResultsDlg.cs b/TestBenchFramework/Forms/PreviousResultsDlg.cs index 282c79487..4607d58b8 100644 --- a/TestBenchFramework/Forms/PreviousResultsDlg.cs +++ b/TestBenchFramework/Forms/PreviousResultsDlg.cs @@ -93,7 +93,7 @@ namespace TBF.Forms ? new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;") : new OracleConnection("Data Source=STARA_TEST.WORLD;User Id=deltachef;Password=deltachef;"); - if (Database.WriteResultsToDatabase(conn, b, true) == Retv.OK) + if (Database.WriteResultsToDatabase(conn, b, false) == Retv.OK) { b.RsltsSent = true; /// Result was successfully sent session.SaveOrUpdate(b); /// Update MySQL DB diff --git a/TestBenchFramework/LoginDlgWithBenchSelection.cs b/TestBenchFramework/LoginDlgWithBenchSelection.cs index df8904cf9..36a67b715 100644 --- a/TestBenchFramework/LoginDlgWithBenchSelection.cs +++ b/TestBenchFramework/LoginDlgWithBenchSelection.cs @@ -51,8 +51,8 @@ namespace TBF { Localize(); #if DEBUG - userNameTextBox.Text = Config.Data.AdminUsername; - passwordTextBox.Text = Config.Data.AdminPassword; + userNameTextBox.Text = "milan"; + passwordTextBox.Text = "napajedla"; #endif for (int i = 0; i < Program.LocalSettings.BenchesCount; i++) { diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index e4114b05b..33db230e4 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.5.256.1")] -[assembly: AssemblyFileVersion("2.5.256.1")] +[assembly: AssemblyVersion("2.5.257.1")] +[assembly: AssemblyFileVersion("2.5.257.1")] diff --git a/exported-on-160406-ver-2-4-256.xlsx b/exported-on-160406-ver-2-4-256.xlsx new file mode 100644 index 000000000..0f2784199 Binary files /dev/null and b/exported-on-160406-ver-2-4-256.xlsx differ