diff --git a/cs/bmx_0200scr/BMX2/BMXNet/BMXNet.csproj b/cs/bmx_0200scr/BMX2/BMXNet/BMXNet.csproj index 2404640..da5a386 100644 --- a/cs/bmx_0200scr/BMX2/BMXNet/BMXNet.csproj +++ b/cs/bmx_0200scr/BMX2/BMXNet/BMXNet.csproj @@ -75,7 +75,7 @@ false - DEBUG;TRACE + TRACE;DEBUG false diff --git a/cs/bmx_0200scr/BMX2/BMXNet/BMXNetConnectInfo.cs b/cs/bmx_0200scr/BMX2/BMXNet/BMXNetConnectInfo.cs index 8854c54..11cdd69 100644 --- a/cs/bmx_0200scr/BMX2/BMXNet/BMXNetConnectInfo.cs +++ b/cs/bmx_0200scr/BMX2/BMXNet/BMXNetConnectInfo.cs @@ -95,8 +95,6 @@ namespace IndianHealthService.BMXNet } set { -// Debug.Write("ConnectInfo handle: " + this.Handle.ToString() + "\n"); - //System.IntPtr pHandle = this.Handle; m_timerEvent.Enabled = value; } } @@ -244,6 +242,7 @@ namespace IndianHealthService.BMXNet args.BMXParam = ""; if (BMXNetEvent != null) { + Debug.Write("BMXNet AutoFire event raised from BMXNetConnectInfo"); BMXNetEvent(obj, args); } this.m_timerEvent.Enabled = true; @@ -904,7 +903,7 @@ namespace IndianHealthService.BMXNet { Debug.Write(ex.Message); //MessageBox.Show(ex.Message, "RPMS Login Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - throw new Exception(ex.Message); ; + throw ex; } }while ((bStop == DialogResult.OK) && (m_BMXNetLib.Connected == false)); } diff --git a/cs/bmx_0200scr/BMX2/BMXNet/BMXNetLib.cs b/cs/bmx_0200scr/BMX2/BMXNet/BMXNetLib.cs index d3f8781..2189ec9 100644 --- a/cs/bmx_0200scr/BMX2/BMXNet/BMXNetLib.cs +++ b/cs/bmx_0200scr/BMX2/BMXNet/BMXNetLib.cs @@ -806,8 +806,8 @@ namespace IndianHealthService.BMXNet } catch (Exception ex) { - string s = ex.Message + ex.StackTrace; - throw new BMXNetException(s); + //string s = ex.Message + ex.StackTrace; + throw new BMXNetException(ex.Message, ex); } } @@ -1105,7 +1105,8 @@ namespace IndianHealthService.BMXNet DateTime receiveTime = DateTime.Now; Debug.Write("TransmitRPC Received: " + strResult.Replace((char) 30, (char) 10) + "\n"); TimeSpan executionTime = receiveTime - sendTime; - Debug.Write("Execution Time: " + executionTime.Milliseconds + " ms.\n"); + Debug.Write("Execution Time: " + executionTime.TotalMilliseconds + " ms.\n"); + Debug.Write("-------------------------------------------------------\n"); #endif if (sOldAppContext != "") { diff --git a/cs/bmx_0200scr/BMX2/BMXNet/DSelectDivision.cs b/cs/bmx_0200scr/BMX2/BMXNet/DSelectDivision.cs index 965c6d4..3b94ec1 100644 --- a/cs/bmx_0200scr/BMX2/BMXNet/DSelectDivision.cs +++ b/cs/bmx_0200scr/BMX2/BMXNet/DSelectDivision.cs @@ -129,6 +129,7 @@ namespace IndianHealthService.BMXNet this.Name = "DSelectDivision"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Select Division"; + this.Load += new System.EventHandler(this.DSelectDivision_Load); this.pnlPageBottom.ResumeLayout(false); this.pnlDescription.ResumeLayout(false); this.grpDescriptionResourceGroup.ResumeLayout(false); @@ -240,6 +241,11 @@ namespace IndianHealthService.BMXNet return; } + private void DSelectDivision_Load(object sender, EventArgs e) + { + this.Activate(); + } + } } diff --git a/cs/bmx_0200scr/BMX2/BMXNet/bin/Release/BMXNet22.dll b/cs/bmx_0200scr/BMX2/BMXNet/bin/Release/BMXNet22.dll index 2c17a46..b7bf481 100644 Binary files a/cs/bmx_0200scr/BMX2/BMXNet/bin/Release/BMXNet22.dll and b/cs/bmx_0200scr/BMX2/BMXNet/bin/Release/BMXNet22.dll differ