Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs
===================================================================
--- Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs	(revision 1068)
+++ Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs	(revision 1069)
@@ -13,5 +13,5 @@
 {
 	/// <summary>
-	/// Summary description for CGView.
+	/// Main Form: Shows Tree of Clinics and Calendar Grid 
 	/// </summary>
 	public class CGView : System.Windows.Forms.Form
@@ -820,7 +820,7 @@
             this.calendarGrid1.TabIndex = 0;
             this.calendarGrid1.TimeScale = 20;
-            this.calendarGrid1.CGAppointmentAdded += new IndianHealthService.ClinicalScheduling.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentAdded);
-            this.calendarGrid1.CGAppointmentChanged += new IndianHealthService.ClinicalScheduling.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentChanged);
-            this.calendarGrid1.CGSelectionChanged += new IndianHealthService.ClinicalScheduling.CGSelectionChangedHandler(this.calendarGrid1_CGSelectionChanged);
+            this.calendarGrid1.CGAppointmentAdded += new CalendarGrid.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentAdded);
+            this.calendarGrid1.CGAppointmentChanged += new CalendarGrid.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentChanged);
+            this.calendarGrid1.CGSelectionChanged += new CalendarGrid.CGSelectionChangedHandler(this.calendarGrid1_CGSelectionChanged);
             this.calendarGrid1.DoubleClick += new System.EventHandler(this.calendarGrid1_DoubleClick);
             // 
@@ -1483,5 +1483,5 @@
 
 					//Position grid to 0700
-					PositionGrid(cg, 7);
+					cg.PositionGrid(7);
 				}
 			}
@@ -1573,5 +1573,5 @@
 				cg.TimeScale = nScale;
 
-				PositionGrid(cg, 7);
+				cg.PositionGrid(7);
 
 				//Get the OverBook and ModifySchedule permissions from ResourceUser table
@@ -1620,17 +1620,4 @@
 				v.calendarGrid1.Refresh();
 			}
-		}
-
-		private void PositionGrid(CalendarGrid cg, int nHour)
-		{
-				//Position grid to nHour
-				int nRow = 0, nCol = 0;
-				DateTime dStart = DateTime.Today;
-				dStart = dStart.AddHours(nHour);
-				cg.GetCellFromTime(dStart, ref nRow, ref nCol, false, "");
-				int nHeight = cg.CellHeight + 10;
-				nHeight *= nRow;
-				cg.AutoScrollPosition = new Point(50, nHeight);
-				cg.Invalidate();
 		}
 
@@ -2429,5 +2416,5 @@
 			CalendarGrid cg = this.calendarGrid1;
 			cg.TimeScale = 10;
-			PositionGrid(cg, 7);
+			cg.PositionGrid(7);
 		}
 
@@ -2436,5 +2423,5 @@
 			CalendarGrid cg = this.calendarGrid1;
 			cg.TimeScale = 15;
-			PositionGrid(cg, 7);
+			cg.PositionGrid(7);
 		}
 
@@ -2443,5 +2430,5 @@
 			CalendarGrid cg = this.calendarGrid1;
 			cg.TimeScale = 20;
-			PositionGrid(cg, 7);
+			cg.PositionGrid(7);
 		}
 
@@ -2450,5 +2437,5 @@
 			CalendarGrid cg = this.calendarGrid1;
 			cg.TimeScale = 30;
-			PositionGrid(cg, 7);
+			cg.PositionGrid(7);
 		}