Changeset 1095 for Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs

Timestamp:

Feb 21, 2011, 9:21:24 AM (14 years ago)

Author:

Sam Habiel

Message:

Remove CGSchedLib.OutputArray everywhere. Used to be needed in VS 2003; not anymore as you can see tables now.
CalendarGrid:

• Make MinSince80 and TimesOverlap static functions for use by other classes since they are done over and over again.

CGAppointments:

• Documentation updates

CGAVDocument:

• Removal of OutputArray

CGDocument:

• Refactored RefreshAvailabilitySchedule
• AddAvailability will not call UpdateAllViews any more. View will be responsible for redrawing itself.
• Removal of OutputArray

CGDocumentManager:

• Removal of OutputArray
• Documentation updates

CGSchedLib: Lots of Changes

• Class now static (new .net 2.0 feature)
• Removed OutputArray
• Documentation Updates
• Commented out now unused CreateAssignedTypeSchedule

CGView:

• OnUpdateScheduleCallback now has try catch when it this.Invokes the original form so that it won't crash if the form has been closed before it gets called.

File:

• Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs (modified) (5 diffs)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs

@@ -799 +799 @@
             foreach (CGAvailability availability in this.m_pAvArray)
             {
-                if (this.TimesOverlap(availability.StartTime, availability.EndTime, timeFromCell, time2))
+                if (TimesOverlap(availability.StartTime, availability.EndTime, timeFromCell, time2))
                 {
                     nAccessTypeID = availability.AvailabilityType;
@@ -842 +842 @@
             foreach (CGAvailability availability in this.m_pAvArray)
             {
-                if (this.TimesOverlap(availability.StartTime, availability.EndTime, timeFromCell, time2))
+                if (TimesOverlap(availability.StartTime, availability.EndTime, timeFromCell, time2))
                 {
                     nAccessTypeID = availability.AvailabilityType;
@@ -894 +894 @@
         }
 
-        private int MinSince80(DateTime d)
+        private static int MinSince80(DateTime d)
         {
             DateTime time = new DateTime(1980, 1, 1, 0, 0, 0);
@@ -1153 +1153 @@
         }
 
-        private bool TimesOverlap(DateTime dStart1, DateTime dEnd1, DateTime dStart2, DateTime dEnd2)
+        /// <summary>
+        /// Do 2 time ranges overlap each other?
+        /// </summary>
+        /// <param name="dStart1">First Start Time</param>
+        /// <param name="dEnd1">First End Time</param>
+        /// <param name="dStart2">Second Start Time</param>
+        /// <param name="dEnd2">Second End Time</param>
+        /// <returns>True or False</returns>
+        public static bool TimesOverlap(DateTime dStart1, DateTime dEnd1, DateTime dStart2, DateTime dEnd2)
         {
             long ticks = dEnd1.Ticks - dStart1.Ticks;
@@ -1165 +1173 @@
             rect.Width = 1;
             rectangle2.Width = 1;
-            rect.Y = this.MinSince80(dStart1);
-            rect.Height = this.MinSince80(dEnd1) - rect.Y;
-            rectangle2.Y = this.MinSince80(dStart2);
-            rectangle2.Height = this.MinSince80(dEnd2) - rectangle2.Y;
+            rect.Y = MinSince80(dStart1);
+            rect.Height = MinSince80(dEnd1) - rect.Y;
+            rectangle2.Y = MinSince80(dStart2);
+            rectangle2.Height = MinSince80(dEnd2) - rectangle2.Y;
             return rectangle2.IntersectsWith(rect);
         }