Changeset 1123 for Scheduling/trunk

Timestamp:

Mar 29, 2011, 10:29:04 AM (14 years ago)

Author:

Sam Habiel

Message:

Several Fixes found in my own testing:

• CalendarGrid needs to have StartDate as 12:00:00, otherwise a subtraction to calculate the column number of each availability doesn't work properly
• CGDocument needs to have SelectedDate set otherwise when it refreshes, it uses the selected date and makes the screen suddenly blank.
• DApptSearch needs to make date/times proper to send over to DB. CGSchedLib.CreateAvailabilitySchedule needs the startDate to be the beginning of the day and end date to be the end of the day. Now this is done.
• Updated exes.

Location:

Scheduling/trunk/cs/bsdx0200GUISourceCode

Files:

• CGDocument.cs (modified) (1 diff)
• CalendarGrid.cs (modified) (2 diffs)
• ClinicalScheduling.csproj.user (modified) (1 diff)
• ClinicalScheduling.suo (modified) ( previous)
• DApptSearch.cs (modified) (2 diffs)
• bin/Release/BMXNet23.dll (modified) ( previous)
• bin/Release/ClinicalScheduling.exe (modified) ( previous)
• bin/Release/ar/ClinicalScheduling.resources.dll (modified) ( previous)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs

@@ -338 +338 @@
             {
                 //Create new Document
+                this.SelectedDate = dDate.Date;
+
                 m_ScheduleType = (m_sResourcesArray.Count == 1) ? ScheduleType.Resource : ScheduleType.Clinic;
                 bool bRet = false;

Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs

@@ -734 +734 @@
         }
 
+        /// <summary>
+        /// Translates a StartTime into a Cell, for coloring
+        /// </summary>
+        /// <param name="dDate"></param>
+        /// <param name="nRow"></param>
+        /// <param name="nCol"></param>
+        /// <param name="bStartCell"></param>
+        /// <param name="sResource"></param>
+        /// <returns></returns>
         public bool GetCellFromTime(DateTime dDate, ref int nRow, ref int nCol, bool bStartCell, string sResource)
         {
@@ -1421 +1430 @@
             set
             {
-                this.m_dtStart = value;
+                //this.m_dtStart = value;
+                this.m_dtStart = value.Date; // only date portion!!!//smh
             }
         }

Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user

@@ -37 +37 @@
     </RemoteDebugMachine>
     <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
+    <StartArguments>/s=172.16.16.108 /p=9250 /a=BASMA.ALDWAIRI /v=SELEN.123 /culture=ar-JO</StartArguments>
     <StartPage>
     </StartPage>

Scheduling/trunk/cs/bsdx0200GUISourceCode/DApptSearch.cs

@@ -245 +245 @@
 
                                 //End
-                                this.m_dEnd = this.dtEnd.Value;
+                this.m_dEnd = this.dtEnd.Value;
                         }               
                 }
@@ -727 +727 @@
             //Get Availabilities and Appointments from the DB
             //NB: m_sAmpm and m_sWeekDays don't have an effect on the M side side right now
-                        string sSearchInfo = "1|" + m_sAmpm + "|" + m_sWeekDays;
+            m_dStart = m_dStart.Date; // move to 1200
+            m_dEnd = m_dEnd.Date.AddHours(23).AddMinutes(59).AddSeconds(59); //move to 235959
+            string sSearchInfo = "1|" + m_sAmpm + "|" + m_sWeekDays;
                         DataTable m_availTable = CGSchedLib.CreateAvailabilitySchedule(m_DocManager, m_alResources, m_dStart, m_dEnd, m_alAccessTypes, ScheduleType.Resource, sSearchInfo);
             DataTable m_apptTable = CGSchedLib.CreateAppointmentSchedule(m_DocManager, m_alResources, m_dStart, m_dEnd);