Changeset 853 for Scheduling/trunk/cs

Timestamp:

Jul 12, 2010, 10:24:09 AM (14 years ago)

Author:

Sam Habiel

Message:

 

Location:

Scheduling/trunk/cs/bsdx0200GUISourceCode

Files:

• CGSchedLib.cs (modified) (5 diffs)
• ClinicalScheduling.suo (modified) ( previous)
• DAccessBlock.cs (modified) (4 diffs)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGSchedLib.cs

@@ -26 +26 @@
                 }
 
+        /// <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 +128 @@
                 }               
 
+
                 public static DataTable CreateAssignedTypeSchedule(CGDocumentManager docManager, string sResourceName, DateTime StartTime, DateTime EndTime, ScheduleType stType)
                 {
@@ -125 +134 @@
                         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 +295 @@
                         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 +372 @@
                         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");

Scheduling/trunk/cs/bsdx0200GUISourceCode/DAccessBlock.cs

@@ -99 +99 @@
             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 +104 @@
             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 +252 @@
             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 +278 @@
             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);
         }