diff --git a/cs/bsdx0200GUISourceCode/CGAppointment.cs b/cs/bsdx0200GUISourceCode/CGAppointment.cs index 81ff66a..ea44962 100644 --- a/cs/bsdx0200GUISourceCode/CGAppointment.cs +++ b/cs/bsdx0200GUISourceCode/CGAppointment.cs @@ -3,8 +3,8 @@ using System; using System.Drawing; /// - /// This class was regenerated from Calendargrid.dll using Reflector.exe - /// by Sam Habiel for WorldVista. The original source code is lost. + /// Data Structuer to Represent an Appointment + /// /// [Serializable] public class CGAppointment @@ -304,6 +304,7 @@ } public Patient Patient { get; set; } + public Provider Provider { get; set; } } } diff --git a/cs/bsdx0200GUISourceCode/CGDocument.cs b/cs/bsdx0200GUISourceCode/CGDocument.cs index c9263f5..da1bfd4 100644 --- a/cs/bsdx0200GUISourceCode/CGDocument.cs +++ b/cs/bsdx0200GUISourceCode/CGDocument.cs @@ -1053,8 +1053,6 @@ namespace IndianHealthService.ClinicalScheduling Debug.Assert(dtAppt.Rows.Count == 1); DataRow r = dtAppt.Rows[0]; string sErrorID = r["ERRORID"].ToString(); - - } public string DeleteAppointment(int nApptID) diff --git a/cs/bsdx0200GUISourceCode/CGDocumentManager.cs b/cs/bsdx0200GUISourceCode/CGDocumentManager.cs index f62a00e..bb861a0 100644 --- a/cs/bsdx0200GUISourceCode/CGDocumentManager.cs +++ b/cs/bsdx0200GUISourceCode/CGDocumentManager.cs @@ -93,6 +93,11 @@ namespace IndianHealthService.ClinicalScheduling m_dsGlobal = value; } } + + /// + /// More later... + /// + public UserPreferences UserPreferences { get; private set; } /// /// Returns the single CGDocumentManager object @@ -460,6 +465,9 @@ namespace IndianHealthService.ClinicalScheduling this.m_PrintingObject = Creator.PrintFactory(); } + //User Preferences Object + _current.UserPreferences = new UserPreferences(); + //Create global dataset _current.m_dsGlobal = new DataSet("GlobalDataSet"); diff --git a/cs/bsdx0200GUISourceCode/CGView.cs b/cs/bsdx0200GUISourceCode/CGView.cs index 15e5706..c800600 100644 --- a/cs/bsdx0200GUISourceCode/CGView.cs +++ b/cs/bsdx0200GUISourceCode/CGView.cs @@ -1263,14 +1263,8 @@ namespace IndianHealthService.ClinicalScheduling if (apptID <= 0) return; CGAppointment a = (CGAppointment) this.Appointments.AppointmentTable[apptID]; - - PrintDocument pd = new PrintDocument() { DocumentName = "Appointment Slip for Appt " + apptID }; //Autoinit for DocName - pd.PrintPage += (s, pe) => //son of a lambda - { - CGDocumentManager.Current.PrintingObject.PrintAppointmentSlip(a, pe); - }; - - pd.Print(); + + PrintAppointmentSlip(a); } //end new code @@ -1929,7 +1923,6 @@ namespace IndianHealthService.ClinicalScheduling private void AppointmentCheckIn() { - int nApptID = this.calendarGrid1.SelectedAppointment; Debug.Assert(nApptID != 0); @@ -1949,35 +1942,9 @@ namespace IndianHealthService.ClinicalScheduling MessageBox.Show(this, "It is too early to check in " + a.PatientName, "Windows Scheduling", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); return; } - //Find the default provider for the resource & load into combo box - DataView rv = new DataView(this.m_DocManager.GlobalDataSet.Tables["Resources"]); - rv.Sort="RESOURCE_NAME ASC"; - int nFind = rv.Find((string) a.Resource); - DataRowView drv = rv[nFind]; - - string sHospLoc = drv["HOSPITAL_LOCATION_ID"].ToString(); - sHospLoc = (sHospLoc == "")?"0":sHospLoc; - int nHospLoc = 0; - try - { - nHospLoc = Convert.ToInt32(sHospLoc); - } - catch(Exception ex) - { - Debug.Write("CGView.AppointmentCheckIn Error: " + ex.Message); - } - - string sProv = ""; - - if (nHospLoc > 0) - { - DataRow dr = drv.Row; - DataRow drHL = dr.GetParentRow(m_DocManager.GlobalDataSet.Relations["HospitalLocationResource"]); - sProv = drHL["DEFAULT_PROVIDER"].ToString(); - } DCheckIn dlgCheckin = new DCheckIn(); - dlgCheckin.InitializePage(a, this.m_DocManager, sProv, nHospLoc); + dlgCheckin.InitializePage(a); calendarGrid1.CGToolTip.Active = false; if (dlgCheckin.ShowDialog(this) != DialogResult.OK) { @@ -1991,16 +1958,19 @@ namespace IndianHealthService.ClinicalScheduling DateTime dtCheckIn = dlgCheckin.CheckInTime; - //Save to Database + //Tell appointment that it is checked in, for proper coloring; + //When you refresh from the DB, it will have this property. + a.CheckInTime = DateTime.Now; + + //Save to Database this.Document.CheckInAppointment(nApptID, dtCheckIn); - //Tell appointment that it is checked in - a.CheckInTime = DateTime.Now; + //Get Provider (XXXXXXXX: NOT SAVED TO THE DATABASE RIGHT NOW) + a.Provider = dlgCheckin.Provider; - //smh new code + // Print Routing Slip if user checks that box... if (dlgCheckin.PrintRouteSlip) - // this.printRoutingSlip.Print(); - // end new code + this.PrintRoutingSlip(a); //redraw grid this.calendarGrid1.Invalidate(); @@ -2217,12 +2187,10 @@ namespace IndianHealthService.ClinicalScheduling //Call Document to add a new appointment. Document adds appointment to CGAppointments array. this.Document.CreateAppointment(appt); - //Experimental now. + if (dAppt.PrintAppointmentSlip) { - System.Drawing.Printing.PrintDocument pd = new System.Drawing.Printing.PrintDocument(); - pd.PrintPage += (object s, System.Drawing.Printing.PrintPageEventArgs e) => CGDocumentManager.Current.PrintingObject.PrintAppointmentSlip(appt, e); - pd.Print(); + PrintAppointmentSlip(appt); } //Show the new set of appointments by calling UpdateArrays. Fetches Document's CGAppointments @@ -3246,11 +3214,18 @@ namespace IndianHealthService.ClinicalScheduling } } - private void printRoutingSlip_PrintPage(object sender, System.Drawing.Printing.PrintPageEventArgs e) + private void PrintRoutingSlip(CGAppointment appt) { - int nApptID = this.calendarGrid1.SelectedAppointment; - CGAppointment a = (CGAppointment)this.Appointments.AppointmentTable[nApptID]; - CGDocumentManager.Current.PrintingObject.PrintRoutingSlip(a, "Routing Slip", e); + PrintDocument pd = new PrintDocument() { DocumentName = "Routing Slip for Appt " + appt.AppointmentKey }; + pd.PrintPage += (object s, System.Drawing.Printing.PrintPageEventArgs e) => CGDocumentManager.Current.PrintingObject.PrintRoutingSlip(appt, "Routing Slip", e); + pd.Print(); + } + + private void PrintAppointmentSlip(CGAppointment appt) + { + PrintDocument pd = new PrintDocument() { DocumentName = "Appointment Slip for Appt " + appt.AppointmentKey }; //Autoinit for DocName + pd.PrintPage += (object s, System.Drawing.Printing.PrintPageEventArgs e) => CGDocumentManager.Current.PrintingObject.PrintAppointmentSlip(appt, e); + pd.Print(); } @@ -3310,6 +3285,9 @@ namespace IndianHealthService.ClinicalScheduling #endregion events + /// + /// Refresh grid if needed. + /// void RequestRefreshGrid() { DateTime dDate = dateTimePicker1.Value.Date; diff --git a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj index 8a22ce9..38c8208 100644 --- a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj +++ b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj @@ -139,6 +139,8 @@ + + dsPatientApptDisplay2.xsd @@ -200,7 +202,7 @@ Form - + Form diff --git a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user index a5c306a..8da5200 100644 --- a/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user +++ b/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user @@ -36,7 +36,7 @@ Project - /s=172.16.16.108 /p=9250 /a=s.habiel /v=catdog.66 + /s=172.16.16.108 /p=9250 /a=BASMA.ALDWAIRI /v=SELEN.123 C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe diff --git a/cs/bsdx0200GUISourceCode/ClinicalScheduling.suo b/cs/bsdx0200GUISourceCode/ClinicalScheduling.suo index 05303ca..333edcb 100644 Binary files a/cs/bsdx0200GUISourceCode/ClinicalScheduling.suo and b/cs/bsdx0200GUISourceCode/ClinicalScheduling.suo differ diff --git a/cs/bsdx0200GUISourceCode/DAppointPage.cs b/cs/bsdx0200GUISourceCode/DAppointPage.cs index d47f0f4..43d2515 100644 --- a/cs/bsdx0200GUISourceCode/DAppointPage.cs +++ b/cs/bsdx0200GUISourceCode/DAppointPage.cs @@ -93,6 +93,8 @@ namespace IndianHealthService.ClinicalScheduling this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.txtSex = new System.Windows.Forms.TextBox(); + this.label18 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); this.txtHRN = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); @@ -128,8 +130,6 @@ namespace IndianHealthService.ClinicalScheduling this.patientApptsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.dsPatientApptDisplay2BindingSource = new System.Windows.Forms.BindingSource(this.components); this.dsPatientApptDisplay2 = new IndianHealthService.ClinicalScheduling.dsPatientApptDisplay2(); - this.label18 = new System.Windows.Forms.Label(); - this.txtSex = new System.Windows.Forms.TextBox(); this.tabControl1.SuspendLayout(); this.tabAppointment.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -280,6 +280,24 @@ namespace IndianHealthService.ClinicalScheduling this.groupBox1.TabStop = false; this.groupBox1.Text = "Patient ID"; // + // txtSex + // + this.txtSex.BackColor = System.Drawing.SystemColors.Control; + this.txtSex.Location = new System.Drawing.Point(273, 41); + this.txtSex.Name = "txtSex"; + this.txtSex.ReadOnly = true; + this.txtSex.Size = new System.Drawing.Size(160, 20); + this.txtSex.TabIndex = 15; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(238, 44); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(29, 13); + this.label18.TabIndex = 14; + this.label18.Text = "Sex:"; + // // label14 // this.label14.Location = new System.Drawing.Point(50, 64); @@ -557,6 +575,7 @@ namespace IndianHealthService.ClinicalScheduling this.chkPrint.TabIndex = 2; this.chkPrint.Text = "Print Appointment Letter"; this.chkPrint.UseVisualStyleBackColor = true; + this.chkPrint.CheckedChanged += new System.EventHandler(this.chkPrint_CheckedChanged); // // cmdCancel // @@ -592,24 +611,6 @@ namespace IndianHealthService.ClinicalScheduling this.dsPatientApptDisplay2.DataSetName = "dsPatientApptDisplay2"; this.dsPatientApptDisplay2.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // label18 - // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(238, 44); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(29, 13); - this.label18.TabIndex = 14; - this.label18.Text = "Sex:"; - // - // txtSex - // - this.txtSex.BackColor = System.Drawing.SystemColors.Control; - this.txtSex.Location = new System.Drawing.Point(273, 41); - this.txtSex.Name = "txtSex"; - this.txtSex.ReadOnly = true; - this.txtSex.Size = new System.Drawing.Size(160, 20); - this.txtSex.TabIndex = 15; - // // DAppointPage // this.AcceptButton = this.cmdOK; @@ -716,6 +717,8 @@ namespace IndianHealthService.ClinicalScheduling Control UC = new UCPatientAppts(m_DocManager, int.Parse(m_sPatientIEN)); UC.Dock = DockStyle.Fill; groupBox4.Controls.Add(UC); + + chkPrint.Checked = CGDocumentManager.Current.UserPreferences.PrintAppointmentSlipAutomacially; } catch(Exception e) { @@ -857,6 +860,17 @@ namespace IndianHealthService.ClinicalScheduling } #endregion //Properties + /// + /// Save Print Slip preference in UserPreferences object. For now, it always starts false since + /// it isn't saved in the DB; but that will change in the future. + /// + /// + /// + private void chkPrint_CheckedChanged(object sender, EventArgs e) + { + CGDocumentManager.Current.UserPreferences.PrintAppointmentSlipAutomacially = chkPrint.Checked; + } + } //end Class } diff --git a/cs/bsdx0200GUISourceCode/DAppointPage.resx b/cs/bsdx0200GUISourceCode/DAppointPage.resx index 76780cc..e916d39 100644 --- a/cs/bsdx0200GUISourceCode/DAppointPage.resx +++ b/cs/bsdx0200GUISourceCode/DAppointPage.resx @@ -123,12 +123,6 @@ 179, 17 - - 179, 17 - - - 17, 17 - 17, 17 diff --git a/cs/bsdx0200GUISourceCode/DCheckIn.cs b/cs/bsdx0200GUISourceCode/DCheckIn.cs index 7911ba9..cc75db9 100644 --- a/cs/bsdx0200GUISourceCode/DCheckIn.cs +++ b/cs/bsdx0200GUISourceCode/DCheckIn.cs @@ -6,6 +6,8 @@ using System.Windows.Forms; using System.Data; using System.Diagnostics; using IndianHealthService.BMXNet; +using System.Collections.Generic; +using System.Linq; namespace IndianHealthService.ClinicalScheduling { @@ -22,10 +24,6 @@ namespace IndianHealthService.ClinicalScheduling // Required for Windows Form Designer support // InitializeComponent(); - - // - // TODO: Add any constructor code after InitializeComponent call - // } @@ -58,8 +56,8 @@ namespace IndianHealthService.ClinicalScheduling private DataTable m_dtForm; private DataView m_dvClinic; private DataView m_dvForm; - private bool m_bInit; public bool m_bPrintRouteSlip; + private List _providers; private ToolTip toolTip1; #endregion Fields @@ -67,13 +65,14 @@ namespace IndianHealthService.ClinicalScheduling #region Properties /// - /// Returns string representation of internal entry number of Provider in PROVIDER File + /// Returns Provider chosen for Check-In /// - public string ProviderIEN + public Provider Provider { get { - return this.m_sProviderIEN; + if (cboProvider.SelectedIndex < 1) return null; // because first item is empty placeholder + else return this._providers[cboProvider.SelectedIndex]; } } @@ -112,66 +111,113 @@ namespace IndianHealthService.ClinicalScheduling /// /// Appointment /// Document Manager - /// Default provider - public void InitializePage(CGAppointment a, CGDocumentManager docManager, - string sDefaultProvider, int nHospLoc) + public void InitializePage(CGAppointment a) { - m_bInit = true; - m_DocManager = docManager; + m_DocManager = CGDocumentManager.Current; m_dsGlobal = m_DocManager.GlobalDataSet; - int nFind = 0; + + Int32? nHospLoc = (from resource in m_dsGlobal.Tables["Resources"].AsEnumerable() + where resource.Field("RESOURCE_NAME") == a.Resource + select resource.Field("HOSPITAL_LOCATION_ID")) + .SingleOrDefault(); + + //smh - following logic replaced with above... + /* + DataView rv = new DataView(this.m_DocManager.GlobalDataSet.Tables["Resources"]); + rv.Sort = "RESOURCE_NAME ASC"; + int nFind = rv.Find((string)a.Resource); + DataRowView drv = rv[nFind]; + + string sHospLoc = drv["HOSPITAL_LOCATION_ID"].ToString(); + sHospLoc = (sHospLoc == "") ? "0" : sHospLoc; + int nHospLoc = 0; + try + { + nHospLoc = Convert.ToInt32(sHospLoc); + } + catch (Exception ex) + { + Debug.Write("CGView.AppointmentCheckIn Error: " + ex.Message); + } + */ //smh new code //if the resource is linked to a valid hospital location, grab this locations providers //from the provider multiple and put them in the combo box. - if (nHospLoc != 0) + if (nHospLoc != null) { //RPC BSDX HOSP LOC PROVIDERS returns Table w/ Columns: //HOSPITAL_LOCATION_ID^BMXIEN (ie Prov IEN)^NAME^DEFALUT string sCommandText = "BSDX HOSP LOC PROVIDERS^" + nHospLoc; - m_dtProvider = docManager.RPMSDataTable(sCommandText, "ClinicProviders"); - m_dtProvider.DefaultView.Sort = "NAME ASC"; + m_dtProvider = m_DocManager.RPMSDataTable(sCommandText, "ClinicProviders"); + + _providers = (from providerRow in m_dtProvider.AsEnumerable() + orderby providerRow.Field("NAME") + select new Provider + { + IEN = providerRow.Field("BMXIEN"), + Name = providerRow.Field("NAME"), + Default = providerRow.Field("DEFAULT") == "YES" ? true : false + }).ToList(); - cboProvider.DataSource = m_dtProvider; - cboProvider.DisplayMember = "NAME"; - cboProvider.ValueMember = "BMXIEN"; - //Add None to the top of the list - DataRow drProv = m_dtProvider.NewRow(); - drProv.BeginEdit(); - drProv["HOSPITAL_LOCATION_ID"] = 0; - drProv["NAME"] = ""; - drProv["BMXIEN"] = 0; - drProv.EndEdit(); - m_dtProvider.Rows.InsertAt(drProv, 0); - cboProvider.SelectedIndex = 0; + + //cboProvider.DisplayMember = "NAME"; + //cboProvider.ValueMember = "BMXIEN"; + _providers.Insert(0, new Provider { Name = "", IEN = -1 }); + cboProvider.DataSource = _providers; + cboProvider.SelectedIndex = _providers.FindIndex(prov => prov.Default); + // if no provider is default, set default to be item. + if (cboProvider.SelectedIndex == -1) cboProvider.SelectedIndex = 0; + ////Add None to the top of the list + //DataRow drProv = m_dtProvider.NewRow(); + //drProv.BeginEdit(); + //drProv["HOSPITAL_LOCATION_ID"] = 0; + //drProv["NAME"] = ""; + //drProv["BMXIEN"] = 0; + //drProv.EndEdit(); + //m_dtProvider.Rows.InsertAt(drProv, 0); + ////cboProvider.SelectedIndex = 0; //Find default provider--search for Yes in Field DEFAULT - DataRow[] nRow = m_dtProvider.Select("DEFAULT='YES'", "NAME ASC"); - if (nRow.Length > 0) nFind = m_dtProvider.Rows.IndexOf(nRow[0]); - cboProvider.SelectedIndex = nFind; + //DataRow[] nRow = m_dtProvider.Select("DEFAULT='YES'", "NAME ASC"); + //if (nRow.Length > 0) nFind = m_dtProvider.Rows.IndexOf(nRow[0]); + } //otherwise, just use the default provider table else { - m_dtProvider = m_dsGlobal.Tables["Provider"]; - m_dtProvider.DefaultView.Sort = "NAME ASC"; - cboProvider.DataSource = m_dtProvider; - cboProvider.DisplayMember = "NAME"; - cboProvider.ValueMember = "BMXIEN"; + _providers = (from providerRow in m_dsGlobal.Tables["Provider"].AsEnumerable() + orderby providerRow.Field("NAME") + select new Provider + { + IEN = providerRow.Field("BMXIEN"), + Name = providerRow.Field("NAME"), + Default = false + }).ToList(); + + + /*m_dtProvider = m_dsGlobal.Tables["Provider"]; + m_dtProvider.DefaultView.Sort = "NAME ASC";*/ + _providers.Insert(0, new Provider { Name = "", IEN = -1 }); + cboProvider.DataSource = _providers; + cboProvider.SelectedIndex = 0; + //cboProvider.DisplayMember = "NAME"; + //cboProvider.ValueMember = "BMXIEN"; //Add None to the top of the list - DataRow drProv = m_dtProvider.NewRow(); - drProv.BeginEdit(); - drProv["NAME"] = ""; - drProv["BMXIEN"] = 0; - drProv.EndEdit(); - m_dtProvider.Rows.InsertAt(drProv, 0); - cboProvider.SelectedIndex = 0; + //DataRow drProv = m_dtProvider.NewRow(); + //drProv.BeginEdit(); + //drProv["NAME"] = ""; + //drProv["BMXIEN"] = 0; + //drProv.EndEdit(); + //m_dtProvider.Rows.InsertAt(drProv, 0); + //cboProvider.SelectedIndex = 0; } + m_sPatientName = a.PatientName; if (a.CheckInTime.Ticks != 0) @@ -186,8 +232,10 @@ namespace IndianHealthService.ClinicalScheduling m_dCheckIn = DateTime.Now; } + //Print Routing Slip based on user preferences. + chkRoutingSlip.Checked = CGDocumentManager.Current.UserPreferences.PrintRoutingSlipAutomatically; + UpdateDialogData(true); - m_bInit = false; } @@ -362,6 +410,7 @@ namespace IndianHealthService.ClinicalScheduling // // cboProvider // + this.cboProvider.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboProvider.Location = new System.Drawing.Point(96, 88); this.cboProvider.Name = "cboProvider"; this.cboProvider.Size = new System.Drawing.Size(240, 21); @@ -383,6 +432,7 @@ namespace IndianHealthService.ClinicalScheduling this.chkRoutingSlip.TabIndex = 14; this.chkRoutingSlip.Text = "Print Routing Slip"; this.toolTip1.SetToolTip(this.chkRoutingSlip, "Prints routing slip to the Windows Default Printer"); + this.chkRoutingSlip.CheckedChanged += new System.EventHandler(this.chkRoutingSlip_CheckedChanged); // // DCheckIn // @@ -417,6 +467,17 @@ namespace IndianHealthService.ClinicalScheduling this.UpdateDialogData(false); } + /// + /// Save this in User Preferences Object. + /// + /// + /// + private void chkRoutingSlip_CheckedChanged(object sender, EventArgs e) + { + CGDocumentManager.Current.UserPreferences.PrintRoutingSlipAutomatically = chkRoutingSlip.Checked; + } + #endregion Events + } } diff --git a/cs/bsdx0200GUISourceCode/DCheckIn.resx b/cs/bsdx0200GUISourceCode/DCheckIn.resx index 7ce03af..80d7730 100644 --- a/cs/bsdx0200GUISourceCode/DCheckIn.resx +++ b/cs/bsdx0200GUISourceCode/DCheckIn.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 \ No newline at end of file diff --git a/cs/bsdx0200GUISourceCode/Patient.cs b/cs/bsdx0200GUISourceCode/Patient.cs index 5b52823..a9f2266 100644 --- a/cs/bsdx0200GUISourceCode/Patient.cs +++ b/cs/bsdx0200GUISourceCode/Patient.cs @@ -43,6 +43,11 @@ namespace IndianHealthService.ClinicalScheduling } } + /// + /// Returns User Friendly Age. If Age < 5, then Years and Months + /// If Age > 5, then only Years. + /// Humans tend to round down their ages. So I follow the same rule here. + /// public string UserFriendlyAge { get diff --git a/cs/bsdx0200GUISourceCode/Provider.cs b/cs/bsdx0200GUISourceCode/Provider.cs new file mode 100644 index 0000000..4c287e6 --- /dev/null +++ b/cs/bsdx0200GUISourceCode/Provider.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace IndianHealthService.ClinicalScheduling +{ + /// + /// Provider puppet + /// + public class Provider + { + public int IEN { get; set; } + public string Name { get; set; } + public bool Default { get; set; } + + public override string ToString() + { + return Name; + } + } +} diff --git a/cs/bsdx0200GUISourceCode/UserPreferences.cs b/cs/bsdx0200GUISourceCode/UserPreferences.cs new file mode 100644 index 0000000..b95840b --- /dev/null +++ b/cs/bsdx0200GUISourceCode/UserPreferences.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace IndianHealthService.ClinicalScheduling +{ + /// + /// Designed to keep user preferences. Very basic for now. + /// + public class UserPreferences + { + public UserPreferences() + { + PrintAppointmentSlipAutomacially = false; + PrintRoutingSlipAutomatically = false; + } + + public bool PrintAppointmentSlipAutomacially { get; set; } + public bool PrintRoutingSlipAutomatically { get; set; } + } +} diff --git a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe index 74e08e1..c9829cb 100644 Binary files a/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe and b/cs/bsdx0200GUISourceCode/bin/Release/ClinicalScheduling.exe differ