From 226b6cb7a1ee2743a8a5dcdbb8fec71d9c03d589 Mon Sep 17 00:00:00 2001 From: sam Date: Wed, 21 Jul 2010 13:42:23 +0000 Subject: [PATCH] --- cs/bsdx0200GUISourceCode/CGView.cs | 15 --------------- cs/bsdx0200GUISourceCode/DResource.cs | 3 ++- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/cs/bsdx0200GUISourceCode/CGView.cs b/cs/bsdx0200GUISourceCode/CGView.cs index f769044..45eb9b6 100644 --- a/cs/bsdx0200GUISourceCode/CGView.cs +++ b/cs/bsdx0200GUISourceCode/CGView.cs @@ -2130,22 +2130,7 @@ namespace IndianHealthService.ClinicalScheduling appt.Resource = sResource; appt.HealthRecordNumber = dPat.HealthRecordNumber; - /* - * 8-10-05 Copied overbook prompt for walkin - * to this position in order to check just prior - * to calling CreateAppointment - */ this.Document.RefreshDocument(); - m_nSlots = m_Document.SlotsAvailable(dStart, dEnd, sResource, out sAccessType, out sAvailabilityMessage); - - if (m_nSlots < 1) - { - DialogResult dr = MessageBox.Show(this, "There are no slots available at the selected time. Do you want to overbook this appointment?", "Clinical Scheduling",MessageBoxButtons.YesNo); - if (dr != DialogResult.Yes) - { - return; - } - } //Call Document to add a walkin appointment int nApptID = this.Document.CreateAppointment(appt, true); diff --git a/cs/bsdx0200GUISourceCode/DResource.cs b/cs/bsdx0200GUISourceCode/DResource.cs index 0b385f3..883e2cf 100644 --- a/cs/bsdx0200GUISourceCode/DResource.cs +++ b/cs/bsdx0200GUISourceCode/DResource.cs @@ -542,7 +542,7 @@ namespace IndianHealthService.ClinicalScheduling //Datasource the HOSPITAL LOCATION combo box DataTable dtHospLoc = dsGlobal.Tables["HospitalLocation"]; m_dvHospLoc = new DataView(dtHospLoc); - m_dvHospLoc.Sort = "HOSPITAL_LOCATION_ID ASC"; + m_dvHospLoc.Sort = "HOSPITAL_LOCATION_ID ASC"; int nFind = m_dvHospLoc.Find((int) 0); if (nFind < 0) { @@ -552,6 +552,7 @@ namespace IndianHealthService.ClinicalScheduling drv["HOSPITAL_LOCATION_ID"]=0; drv.EndEdit(); } + m_dvHospLoc.Sort = "HOSPITAL_LOCATION ASC"; // DataTable dtClinicParams = dsGlobal.Tables["ClinicSetupParameters"]; // m_dvClinicParams = new DataView(dtClinicParams);