Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/CGSchedLib.cs
===================================================================
--- Scheduling/trunk/cs/bsdx0200GUISourceCode/CGSchedLib.cs	(revision 850)
+++ Scheduling/trunk/cs/bsdx0200GUISourceCode/CGSchedLib.cs	(revision 853)
@@ -26,4 +26,12 @@
 		}
 
+        /// <summary>
+        /// Gets appointments from VISTA to display in Grid
+        /// </summary>
+        /// <param name="docManager"></param>
+        /// <param name="saryResNames"></param>
+        /// <param name="StartTime"></param>
+        /// <param name="EndTime"></param>
+        /// <returns></returns>
 		public static DataTable CreateAppointmentSchedule(CGDocumentManager docManager, ArrayList saryResNames, DateTime StartTime, DateTime EndTime)
 		{
@@ -120,4 +128,5 @@
 		}		
 
+
 		public static DataTable CreateAssignedTypeSchedule(CGDocumentManager docManager, string sResourceName, DateTime StartTime, DateTime EndTime, ScheduleType stType)
 		{
@@ -125,6 +134,8 @@
 			string sStart;
 			string sEnd;
-			sStart = StartTime.ToString("M-d-yyyy");
-			sEnd = EndTime.ToString("M-d-yyyy");
+			//sStart = StartTime.ToString("M-d-yyyy");
+            sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
+			//sEnd = EndTime.ToString("M-d-yyyy");
+            sEnd = FMDateTime.Create(EndTime).DateOnly.FMDateString;
 //			string sSource = (stType == ScheduleType.Resource ? "ST_RESOURCE" : "ST_CLINIC");
 			string sSql = "BSDX TYPE BLOCKS OVERLAP^" + sStart + "^" + sEnd + "^" + sResourceName ;//+ "^" + sSource;
@@ -284,6 +295,8 @@
 			string sStart;
 			string sEnd;
-			sStart = StartTime.ToString("M-d-yyyy");
-			sEnd = EndTime.ToString("M-d-yyyy@H:mm");
+			//sStart = StartTime.ToString("M-d-yyyy"); smh
+            sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
+			//sEnd = EndTime.ToString("M-d-yyyy@H:mm"); smh
+            sEnd = FMDateTime.Create(EndTime).FMDateString;
 			string sSql = "BSDX CREATE ASGND SLOT SCHED^" + sResourceName + "^" + sStart + "^" + sEnd + "^" + sApptTypeIDs + "^" + sSearchInfo; //+ "^" + sSTType ;
 
@@ -359,6 +372,8 @@
 			string sStart;
 			string sEnd;
-			sStart = StartTime.ToString("M-d-yyyy");
-			sEnd = EndTime.ToString("M-d-yyyy");
+			//sStart = StartTime.ToString("M-d-yyyy");
+            sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
+			//sEnd = EndTime.ToString("M-d-yyyy");
+            sEnd = FMDateTime.Create(EndTime).DateOnly.FMDateString;
 
 			string sSTType = (stType == ScheduleType.Resource ? "ST_RESOURCE" : "ST_CLINIC");
Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/DAccessBlock.cs
===================================================================
--- Scheduling/trunk/cs/bsdx0200GUISourceCode/DAccessBlock.cs	(revision 850)
+++ Scheduling/trunk/cs/bsdx0200GUISourceCode/DAccessBlock.cs	(revision 853)
@@ -99,5 +99,4 @@
             this.panel1.Size = new Size(0x192, 40);
             this.panel1.TabIndex = 2;
-            this.cmdCancel.DialogResult = DialogResult.Cancel;
             this.cmdCancel.Location = new Point(0x120, 8);
             this.cmdCancel.Name = "cmdCancel";
@@ -105,5 +104,5 @@
             this.cmdCancel.TabIndex = 1;
             this.cmdCancel.Text = "Cancel";
-            this.cmdOK.DialogResult = DialogResult.OK;
+
             this.cmdOK.Location = new Point(0xd0, 8);
             this.cmdOK.Name = "cmdOK";
@@ -253,4 +252,6 @@
             this.cboAccessTypeFilter.DisplayMember = "ACCESS_GROUP";
             this.cboAccessTypeFilter.SelectedIndex = this.cboAccessTypeFilter.Items.Count - 1;
+            this.cmdCancel.DialogResult = DialogResult.Cancel;
+            this.cmdOK.DialogResult = DialogResult.OK;
             this.UpdateDialogData(true);
         }
@@ -277,4 +278,6 @@
             this.cboAccessTypeFilter.SelectedIndex = this.cboAccessTypeFilter.Items.Count - 1;
             this.m_pAppt.AccessTypeID = 0;
+            this.cmdCancel.DialogResult = DialogResult.Cancel;
+            this.cmdOK.DialogResult = DialogResult.OK;
             this.UpdateDialogData(true);
         }