git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1085 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 022ce2c83a77522b4513a068feb7461a6a87dd16..4ba4110213b0e06ee26c251490796a9404ca1abd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-06-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+       * UI/Scheduler/NSArray+Scheduler.m ([NSArray
+       -compareEventsAscending:otherEvent]): no longer use compare: on
+       the time objects since one of them could be an NSNull, which
+       crashes when comparing with anything.
+
        * UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions
        -eventsListAction]): sort events from here.
        ([UIxCalListingActions -tasksListAction]): sort tasks from here.

diff --git a/UI/Scheduler/NSArray+Scheduler.m b/UI/Scheduler/NSArray+Scheduler.m
index d6d45df11ce27bf7a6ea52a9cc37a1891678353c..6425f6c53721036b5b442ddca7a1c269a82511e9 100644 (file)
--- a/UI/Scheduler/NSArray+Scheduler.m
+++ b/UI/Scheduler/NSArray+Scheduler.m
@@ -49,7 +49,19 @@
 
 - (NSComparisonResult) compareEventsAscending: (NSArray *) otherEvent
 {
-  return [[self objectAtIndex: 4] compare: [otherEvent objectAtIndex: 4]];
+  NSComparisonResult result;
+  unsigned int selfTime, otherTime;
+
+  selfTime = [[self objectAtIndex: 4] intValue];
+  otherTime = [[otherEvent objectAtIndex: 4] intValue];
+  if (selfTime > otherTime)
+    result = NSOrderedDescending;
+  else if (selfTime < otherTime)
+    result = NSOrderedAscending;
+  else
+    result = NSOrderedSame;
+
+  return result;
 }
 
 - (NSComparisonResult) compareTasksAscending: (NSArray *) otherTask

diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index a8f87456eacba218d5da42a684bccff0bcfb5c75..80aa062188ead7ff19d72a8878bfe832ad192522 100644 (file)
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -19,10 +19,9 @@ DIV#tasksListView
   top: 17em;
   bottom: 0px;
   left: .2em;
-  right: .7em;
+  right: 0px;
   padding: 0px;
-  overflow: hidden;
-}
+  overflow: hidden; }
 
 DIV#tasksListView H2
 { font-size: 10pt;
@@ -55,7 +54,7 @@ DIV.colorBox
 
 UL#tasksList, UL#calendarList
 { cursor: default;
-  margin: .25em;
+  margin: 0px;
   padding: 0px;
   border-bottom: 1px solid #fff;
   border-right: 1px solid #fff;
@@ -66,7 +65,7 @@ UL#tasksList, UL#calendarList
   -moz-border-left-colors: #9c9a94 #000 transparent;
   list-style-type: none;
   list-style-image: none;
-  overflow-y: auto;
+  overflow: auto;
   overflow-x: hidden; }
 
 UL#calendarList
@@ -79,10 +78,9 @@ UL#calendarList LI
 
 UL#tasksList
 { position: absolute;
-  width: 100%;
   top: 2em;
-  left: .25em;
-  right: .25em;
+  left: 0px;
+  right: 0px;
   bottom: .25em; }
 
 UL#tasksList LI