Changeset 1097 for Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.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/CGView.cs (modified) (12 diffs)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs

@@ -617 +617 @@
             this.tvSchedules.Location = new System.Drawing.Point(0, 0);
             this.tvSchedules.Name = "tvSchedules";
-            this.tvSchedules.Size = new System.Drawing.Size(128, 400);
+            this.tvSchedules.Size = new System.Drawing.Size(128, 358);
             this.tvSchedules.Sorted = true;
             this.tvSchedules.TabIndex = 1;
@@ -664 +664 @@
             this.panelRight.Location = new System.Drawing.Point(941, 0);
             this.panelRight.Name = "panelRight";
-            this.panelRight.Size = new System.Drawing.Size(128, 400);
+            this.panelRight.Size = new System.Drawing.Size(128, 358);
             this.panelRight.TabIndex = 3;
             this.panelRight.Visible = false;
@@ -737 +737 @@
             this.dateTimePicker1.Dock = System.Windows.Forms.DockStyle.Right;
             this.dateTimePicker1.DropDownAlign = System.Windows.Forms.LeftRightAlignment.Right;
-            this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dateTimePicker1.Location = new System.Drawing.Point(685, 0);
+            this.dateTimePicker1.Location = new System.Drawing.Point(607, 0);
             this.dateTimePicker1.Name = "dateTimePicker1";
-            this.dateTimePicker1.Size = new System.Drawing.Size(128, 20);
+            this.dateTimePicker1.Size = new System.Drawing.Size(206, 20);
             this.dateTimePicker1.TabIndex = 1;
             this.dateTimePicker1.CloseUp += new System.EventHandler(this.dateTimePicker1_CloseUp);
@@ -761 +760 @@
             this.panelCenter.Location = new System.Drawing.Point(136, 24);
             this.panelCenter.Name = "panelCenter";
-            this.panelCenter.Size = new System.Drawing.Size(802, 352);
+            this.panelCenter.Size = new System.Drawing.Size(802, 310);
             this.panelCenter.TabIndex = 7;
             // 
@@ -847 +846 @@
             this.panelBottom.Controls.Add(this.statusBar1);
             this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelBottom.Location = new System.Drawing.Point(136, 376);
+            this.panelBottom.Location = new System.Drawing.Point(136, 334);
             this.panelBottom.Name = "panelBottom";
             this.panelBottom.Size = new System.Drawing.Size(802, 24);
@@ -865 +864 @@
             this.splitter1.Location = new System.Drawing.Point(128, 24);
             this.splitter1.Name = "splitter1";
-            this.splitter1.Size = new System.Drawing.Size(8, 376);
+            this.splitter1.Size = new System.Drawing.Size(8, 334);
             this.splitter1.TabIndex = 9;
             this.splitter1.TabStop = false;
@@ -874 +873 @@
             this.splitter2.Location = new System.Drawing.Point(938, 24);
             this.splitter2.Name = "splitter2";
-            this.splitter2.Size = new System.Drawing.Size(3, 376);
+            this.splitter2.Size = new System.Drawing.Size(3, 334);
             this.splitter2.TabIndex = 10;
             this.splitter2.TabStop = false;
@@ -902 +901 @@
             this.calendarGrid1.Resources = ((System.Collections.ArrayList)(resources.GetObject("calendarGrid1.Resources")));
             this.calendarGrid1.SelectedAppointment = 0;
-            this.calendarGrid1.Size = new System.Drawing.Size(802, 352);
+            this.calendarGrid1.Size = new System.Drawing.Size(802, 310);
             this.calendarGrid1.StartDate = new System.DateTime(2003, 1, 27, 0, 0, 0, 0);
             this.calendarGrid1.TabIndex = 0;
@@ -915 +914 @@
             // 
             this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-            this.ClientSize = new System.Drawing.Size(1069, 400);
+            this.ClientSize = new System.Drawing.Size(1069, 358);
             this.Controls.Add(this.panelCenter);
             this.Controls.Add(this.panelBottom);
@@ -1988 +1987 @@
                 this.Document.CheckInAppointment(nApptID, dtCheckIn);
 
-                //Tell appointment that it is checked in--smh cancel that!
-                //a.CheckInTime = DateTime.Now;
+                //Tell appointment that it is checked in
+                a.CheckInTime = DateTime.Now;
 
                 //smh new code
@@ -1996 +1995 @@
                 // end new code
 
-                //redraw grid (would this work???)
+                //redraw grid
                                 this.calendarGrid1.Invalidate();
                         }
@@ -2475 +2474 @@
                 return;
 
-            string sResource = dSearch.SelectedResource;
+            CGAvailability av = dSearch.SelectedAvailability;
+
             ArrayList alResource = new ArrayList();
-            alResource.Add(sResource);
-            DateTime sDate = dSearch.SelectedDate;
-            m_sDocName = sResource;
+            alResource.Add(av.ResourceList);
+            DateTime sDate = av.StartTime;
+            m_sDocName = av.ResourceList;
             OpenSelectedSchedule(alResource, sDate);