Changeset 1097 for Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVDocument.cs

Timestamp:

Mar 3, 2011, 4:44:18 AM (13 years ago)

Author:

Sam Habiel

Message:

DPatientLookup.cs: Usings Cleanup
DApptSearch: Extensive refactoring. Now uses new algorithm to find appointments. Now outputs CGAvailability
CGView: Appointments checked in now set the Checkin time on the appointment structure; changes to support DApptSearch modified output.
CGSchedLib: Extensive refactoring; only 2 methods remain: CreateAppointmentSchedule and CreateAvailabilitySchedule
CGDocument: SlotsAvailable uses a new algorithm
CGAVView: Uses CalendarGrid.TimesOverlap instead of the removed one in CGSchedLib
CGAVDocument: Uses CalendarGrid.TimesOverlap instead of the removed one in CGSchedLib; CreateAssignedSlotSchedule reassigned to CreateAvailabilitySchedule

File:

• Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVDocument.cs (modified) (3 diffs)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVDocument.cs

@@ -169 +169 @@
                                         DateTime sStart2 = a.StartTime;
                                         DateTime sEnd2 = a.EndTime;
-                                        if ((a.AppointmentKey != pAppt.AppointmentKey) && (CGSchedLib.TimesOverlap(dNewStart, dNewEnd, a.StartTime, a.EndTime)))
+                                        if ((a.AppointmentKey != pAppt.AppointmentKey) && (CalendarGrid.TimesOverlap(dNewStart, dNewEnd, a.StartTime, a.EndTime)))
                                         {
                                                 MessageBox.Show("Access blocks may not overlap.","Clinical Scheduling", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
@@ -298 +298 @@
                                         DateTime sStart2 = a.StartTime;
                                         DateTime sEnd2 = a.EndTime;
-                                        if (CGSchedLib.TimesOverlap(aCopy.StartTime, aCopy.EndTime, a.StartTime, a.EndTime))
+                                        if (CalendarGrid.TimesOverlap(aCopy.StartTime, aCopy.EndTime, a.StartTime, a.EndTime))
                                         {
                                                 //                                              throw new Exception("Access blocks may not overlap.");
@@ -374 +374 @@
                         ArrayList apptTypeIDs = new ArrayList();
 
-                        rAppointmentSchedule = CGSchedLib.CreateAssignedSlotSchedule(m_DocManager, (string) m_sResourcesArray[0], this.m_dStartDate, this.m_dEndDate, apptTypeIDs,/* */ this.m_ScheduleType, "0");
+                        rAppointmentSchedule = CGSchedLib.CreateAvailabilitySchedule(m_DocManager, m_sResourcesArray, this.m_dStartDate, this.m_dEndDate, apptTypeIDs,/* */ this.m_ScheduleType, "0");
 
                         foreach (DataRow r in rAppointmentSchedule.Rows)