Changeset 892 for Scheduling/trunk/cs

Timestamp:

Jul 21, 2010, 9:42:23 AM (14 years ago)

Author:

Sam Habiel

Message:

 

Location:

Scheduling/trunk/cs/bsdx0200GUISourceCode

Files:

• CGView.cs (modified) (1 diff)
• DResource.cs (modified) (2 diffs)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs

@@ -2131 +2131 @@
                                 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

Scheduling/trunk/cs/bsdx0200GUISourceCode/DResource.cs

@@ -543 +543 @@
                         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)
@@ -553 +553 @@
                                 drv.EndEdit();
                         }
+            m_dvHospLoc.Sort = "HOSPITAL_LOCATION ASC";
 
 //                      DataTable dtClinicParams = dsGlobal.Tables["ClinicSetupParameters"];