diff --git a/cs/bsdx0200GUISourceCode/AssemblyInfo.cs b/cs/bsdx0200GUISourceCode/AssemblyInfo.cs index d007442..b588652 100644 --- a/cs/bsdx0200GUISourceCode/AssemblyInfo.cs +++ b/cs/bsdx0200GUISourceCode/AssemblyInfo.cs @@ -27,7 +27,7 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.0.0.*")] +[assembly: AssemblyVersion("2.0.1.*")] // // In order to sign your assembly you must specify a key to use. Refer to the @@ -57,5 +57,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] -[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.1.0")] [assembly: ComVisibleAttribute(false)] diff --git a/cs/bsdx0200GUISourceCode/CGDocumentManager.cs b/cs/bsdx0200GUISourceCode/CGDocumentManager.cs index 1b77dec..9ee3a7b 100644 --- a/cs/bsdx0200GUISourceCode/CGDocumentManager.cs +++ b/cs/bsdx0200GUISourceCode/CGDocumentManager.cs @@ -389,6 +389,7 @@ namespace IndianHealthService.ClinicalScheduling path = path.Substring(0, path.LastIndexOf('\\')); //path = path.Substring(0, path.LastIndexOf('\\')); path = path + '\\' + "Putty\\putty.exe"; + if (System.IO.File.Exists(path)) { string prms = "-ssh -l " + m_SshUser + " -pw " + m_SshPassword + " -L " + m_Port + ":127.0.0.1:" + m_Port + " " + m_Server; @@ -919,9 +920,16 @@ DoneTrying: //Table #19 setProgressDelegate(21); _current.RemoteSession.EventServices.Subscribe("BSDX ADMIN SHUTDOWN"); - - _current.RemoteSession.EventServices.EventPollingInterval = 5000; //in milliseconds - _current.RemoteSession.EventServices.IsEventPollingEnabled = true; + + string result = _current.RemoteSession.TransmitRPC("VEFA GET BMX POLL INTERVAL",""); + bool eventPoolEnabled = false; + if (result.Split('^')[0] == "1") + { + eventPoolEnabled = true; + } + int eventPoolInterval = Convert.ToInt32(result.Split('^')[1]); + _current.RemoteSession.EventServices.EventPollingInterval = (eventPoolInterval * 1000); //in milliseconds + _current.RemoteSession.EventServices.IsEventPollingEnabled = eventPoolEnabled; //PORT TODO: No Autofire in BMX 4.0 //_current.RemoteSession.EventServices. = 12; //AutoFire every 12*5 seconds diff --git a/cs/bsdx0200GUISourceCode/CGView.cs b/cs/bsdx0200GUISourceCode/CGView.cs index d794424..39eb24c 100644 --- a/cs/bsdx0200GUISourceCode/CGView.cs +++ b/cs/bsdx0200GUISourceCode/CGView.cs @@ -4041,6 +4041,11 @@ namespace IndianHealthService.ClinicalScheduling private void mnuRefresh_Click(object sender, EventArgs e) { + //this.m_DocManager.RemoteSession.EventServices.EventPollingInterval = 50000; + //this.m_DocManager.RemoteSession.EventServices.RefreshEventPoll(); + this.DocManager.RemoteSession.EventServices.IsEventPollingEnabled = true; + this.DocManager.RemoteSession.EventServices.RefreshEventPoll(); + this.DocManager.RemoteSession.EventServices.IsEventPollingEnabled = false; ForceRefreshGrid(); } diff --git a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj index be940da..3765200 100644 --- a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj +++ b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj @@ -52,8 +52,8 @@ false false true - 1 - 2.0.0.%2a + 0 + 2.0.1.%2a false true true diff --git a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user index 7448f9e..fdf70e3 100644 --- a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user +++ b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user @@ -36,8 +36,7 @@ Project - - + /s=166.78.184.181 /p=9260 /su=client9260 /sp=not#1sostrong C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe diff --git a/cs/bsdx0200GUISourceCode/DManagement.cs b/cs/bsdx0200GUISourceCode/DManagement.cs index 03d9947..374001d 100644 --- a/cs/bsdx0200GUISourceCode/DManagement.cs +++ b/cs/bsdx0200GUISourceCode/DManagement.cs @@ -111,7 +111,11 @@ namespace IndianHealthService.ClinicalScheduling private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Label lblWorkstations; private System.Windows.Forms.DataGrid grdWorkStations; - private System.Windows.Forms.TextBox txtSendMessage; + private TabPage tpConfiguration; + private CheckBox chkEventPolling; + private Label lblEventPollInterval; + private NumericUpDown nudEventPolling; + private System.Windows.Forms.TextBox txtSendMessage; #endregion Fields @@ -384,11 +388,18 @@ namespace IndianHealthService.ClinicalScheduling cboBSDXClinic.DisplayMember = "RESOURCE_NAME"; cboBSDXClinic.ValueMember = "RESOURCEID"; - } + string result = docManager.RemoteSession.TransmitRPC("VEFA GET BMX POLL INTERVAL", ""); + if (result.Split('^')[0] == "1") + { + chkEventPolling.Checked = true; + nudEventPolling.Enabled = true; + nudEventPolling.Value = Convert.ToInt32(result.Split('^')[1]); + } + } private void DManagement_Load(object sender, System.EventArgs e) { - this.cmdChangeResource.Enabled = false; + this.cmdChangeResource.Enabled = false; this.cmdRemoveUser.Enabled = false; //Select the grid's zeroeth row if (m_dvResources.Count > 0) @@ -513,6 +524,10 @@ namespace IndianHealthService.ClinicalScheduling this.cmdWorkStationsMessage = new System.Windows.Forms.Button(); this.cmdWorkStationsShutdown = new System.Windows.Forms.Button(); this.cmdWorkStationsRefresh = new System.Windows.Forms.Button(); + this.tpConfiguration = new System.Windows.Forms.TabPage(); + this.nudEventPolling = new System.Windows.Forms.NumericUpDown(); + this.lblEventPollInterval = new System.Windows.Forms.Label(); + this.chkEventPolling = new System.Windows.Forms.CheckBox(); this.pnlPageBottom.SuspendLayout(); this.tabMain.SuspendLayout(); this.tpResources.SuspendLayout(); @@ -545,6 +560,8 @@ namespace IndianHealthService.ClinicalScheduling this.pnlWorkstations.SuspendLayout(); this.groupBox1.SuspendLayout(); this.panel1.SuspendLayout(); + this.tpConfiguration.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudEventPolling)).BeginInit(); this.SuspendLayout(); // // pnlPageBottom @@ -573,6 +590,7 @@ namespace IndianHealthService.ClinicalScheduling this.tabMain.Controls.Add(this.tpAccessGroups); this.tabMain.Controls.Add(this.tpTransferAppts); this.tabMain.Controls.Add(this.tpWorkStations); + this.tabMain.Controls.Add(this.tpConfiguration); this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMain.Location = new System.Drawing.Point(0, 0); this.tabMain.Name = "tabMain"; @@ -830,8 +848,8 @@ namespace IndianHealthService.ClinicalScheduling this.label1.Size = new System.Drawing.Size(690, 53); this.label1.TabIndex = 1; this.label1.Text = " Use the Access Types panel to define the kinds of access available for schedulin" + - "g at this facility. Common types of access include Walkin, Scheduled, Same Day," + - " and Dental Expanded Functions."; + "g at this facility. Common types of access include Walkin, Scheduled, Same Day," + + " and Dental Expanded Functions."; // // pnlAddEditAT // @@ -1182,6 +1200,63 @@ namespace IndianHealthService.ClinicalScheduling this.cmdWorkStationsRefresh.Text = "&Refresh"; this.cmdWorkStationsRefresh.Click += new System.EventHandler(this.cmdWorkStationsRefresh_Click); // + // tpConfiguration + // + this.tpConfiguration.BackColor = System.Drawing.SystemColors.Control; + this.tpConfiguration.Controls.Add(this.nudEventPolling); + this.tpConfiguration.Controls.Add(this.lblEventPollInterval); + this.tpConfiguration.Controls.Add(this.chkEventPolling); + this.tpConfiguration.Location = new System.Drawing.Point(4, 22); + this.tpConfiguration.Name = "tpConfiguration"; + this.tpConfiguration.Padding = new System.Windows.Forms.Padding(3); + this.tpConfiguration.Size = new System.Drawing.Size(696, 428); + this.tpConfiguration.TabIndex = 7; + this.tpConfiguration.Text = "Configuration"; + // + // nudEventPolling + // + this.nudEventPolling.Enabled = false; + this.nudEventPolling.Location = new System.Drawing.Point(374, 24); + this.nudEventPolling.Maximum = new decimal(new int[] { + 9999999, + 0, + 0, + 0}); + this.nudEventPolling.Minimum = new decimal(new int[] { + 5, + 0, + 0, + 0}); + this.nudEventPolling.Name = "nudEventPolling"; + this.nudEventPolling.Size = new System.Drawing.Size(74, 20); + this.nudEventPolling.TabIndex = 11; + this.nudEventPolling.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + this.nudEventPolling.ValueChanged += new System.EventHandler(this.nudEventPolling_ValueChanged); + // + // lblEventPollInterval + // + this.lblEventPollInterval.AutoSize = true; + this.lblEventPollInterval.Location = new System.Drawing.Point(185, 26); + this.lblEventPollInterval.Name = "lblEventPollInterval"; + this.lblEventPollInterval.Size = new System.Drawing.Size(167, 13); + this.lblEventPollInterval.TabIndex = 9; + this.lblEventPollInterval.Text = "Event Polling Interval (in seconds)"; + // + // chkEventPolling + // + this.chkEventPolling.AutoSize = true; + this.chkEventPolling.Location = new System.Drawing.Point(33, 25); + this.chkEventPolling.Name = "chkEventPolling"; + this.chkEventPolling.Size = new System.Drawing.Size(130, 17); + this.chkEventPolling.TabIndex = 7; + this.chkEventPolling.Text = "Event Polling Enabled"; + this.chkEventPolling.UseVisualStyleBackColor = true; + this.chkEventPolling.CheckedChanged += new System.EventHandler(this.chkEventPolling_CheckedChanged); + // // DManagement // this.AcceptButton = this.cmdClose; @@ -1227,6 +1302,9 @@ namespace IndianHealthService.ClinicalScheduling this.groupBox1.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.tpConfiguration.ResumeLayout(false); + this.tpConfiguration.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudEventPolling)).EndInit(); this.ResumeLayout(false); } @@ -2401,5 +2479,31 @@ namespace IndianHealthService.ClinicalScheduling } #endregion Workstations + private void chkEventPolling_CheckedChanged(object sender, EventArgs e) + { + if (chkEventPolling.Checked) + { + nudEventPolling.Enabled = true; + int interval = Convert.ToInt32(nudEventPolling.Value); + string result = this.m_DocManager.RemoteSession.TransmitRPC("VEFA SET BMX POLL INTERVAL", interval.ToString()); + this.m_DocManager.RemoteSession.EventServices.EventPollingInterval = (interval * 1000); + this.m_DocManager.RemoteSession.EventServices.IsEventPollingEnabled = true; + } + else + { + nudEventPolling.Enabled = false; + string result = this.m_DocManager.RemoteSession.TransmitRPC("VEFA SET BMX POLL INTERVAL", "0"); + this.m_DocManager.RemoteSession.EventServices.EventPollingInterval = 5000; + this.m_DocManager.RemoteSession.EventServices.IsEventPollingEnabled = false; + } + } + + private void nudEventPolling_ValueChanged(object sender, EventArgs e) + { + string result = this.m_DocManager.RemoteSession.TransmitRPC("VEFA SET BMX POLL INTERVAL", nudEventPolling.Value.ToString()); + this.m_DocManager.RemoteSession.EventServices.IsEventPollingEnabled = false; + this.m_DocManager.RemoteSession.EventServices.EventPollingInterval = (Convert.ToInt32(nudEventPolling.Value) * 1000); + this.m_DocManager.RemoteSession.EventServices.IsEventPollingEnabled = true; + } } } diff --git a/cs/bsdx0200GUISourceCode/bin/Release/BMXNET40.dll b/cs/bsdx0200GUISourceCode/bin/Release/BMXNET40.dll index 450dec4..f11e575 100644 Binary files a/cs/bsdx0200GUISourceCode/bin/Release/BMXNET40.dll and b/cs/bsdx0200GUISourceCode/bin/Release/BMXNET40.dll differ diff --git a/cs/bsdx0200GUISourceCode/bin/Release/BMXNET40.pdb b/cs/bsdx0200GUISourceCode/bin/Release/BMXNET40.pdb index c88e004..be94f61 100644 Binary files a/cs/bsdx0200GUISourceCode/bin/Release/BMXNET40.pdb and b/cs/bsdx0200GUISourceCode/bin/Release/BMXNET40.pdb differ diff --git a/cs/bsdx0200GUISourceCode/bin/Release/BMXWIN40.dll b/cs/bsdx0200GUISourceCode/bin/Release/BMXWIN40.dll index 117ad86..8a87b01 100644 Binary files a/cs/bsdx0200GUISourceCode/bin/Release/BMXWIN40.dll and b/cs/bsdx0200GUISourceCode/bin/Release/BMXWIN40.dll differ diff --git a/cs/bsdx0200GUISourceCode/bin/Release/BMXWIN40.pdb b/cs/bsdx0200GUISourceCode/bin/Release/BMXWIN40.pdb index 91ae0e4..0c16526 100644 Binary files a/cs/bsdx0200GUISourceCode/bin/Release/BMXWIN40.pdb and b/cs/bsdx0200GUISourceCode/bin/Release/BMXWIN40.pdb differ diff --git a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.application b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.application index b79f325..a35e9cc 100644 --- a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.application +++ b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.application @@ -1,6 +1,6 @@  - + @@ -8,13 +8,13 @@ - + - j5w40iyHj1z9mmfDIEACj+b+ltk= + E9N0YhCSPMvozxYigYswtTijFvY= diff --git a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe index 30d4db0..be52d73 100644 Binary files a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe and b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe differ diff --git a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe.config b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe.config index 17b922d..dd11695 100644 --- a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe.config +++ b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe.config @@ -11,5 +11,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe.manifest b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe.manifest index 3671613..d7733cb 100644 --- a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe.manifest +++ b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -43,50 +43,50 @@ - + - 87hyS0Cc8g0C25p8lM/YJxDWmS0= + BuPNd0YwOUCOVZHLX1mbUngBCRA= - + - Bat1XLf4HJ6KVnk8jAG0GWO3Btw= + GUd/pXlwaLDjoY/43aEkcBkqBKY= - + - kLWcOlE0wrV4llowt87RoKjIMgg= + 9kNK3139SoUY6RVxrpqC/e+Jrjg= - + - uGPZoM38EhWW3xqvMljNbIyrwX0= + MfE38dsPcWZ3BLKvbiIPDrfZaDo= @@ -102,13 +102,13 @@ - + - lEUsBWWQtJix6v4p2Q8lns1f5Vk= + BCce4nUOp5hl3qvhPufpWRGw9q4= diff --git a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.pdb b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.pdb index cb9a8fd..b692a10 100644 Binary files a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.pdb and b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.pdb differ diff --git a/cs/bsdx0200GUISourceCode/bin/Release/ar/ClinicalScheduling.resources.dll b/cs/bsdx0200GUISourceCode/bin/Release/ar/ClinicalScheduling.resources.dll index aff97d2..6623822 100644 Binary files a/cs/bsdx0200GUISourceCode/bin/Release/ar/ClinicalScheduling.resources.dll and b/cs/bsdx0200GUISourceCode/bin/Release/ar/ClinicalScheduling.resources.dll differ