Monotone-Parent: 20c04b0bdf1f43a5ad91e5871e2205434e862cd6

Monotone-Revision: 6ad4e3d54cbe359d0d7a0e60445f3c30101e2600

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-13T19:33:31
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2007-06-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions
+	-eventsListAction]): sort events from here.
+	([UIxCalListingActions -tasksListAction]): sort tasks from here.
+
 	* SoObjects/SOGo/NSObject+AptComparison.[hm]: removed category
 	module, replaced with NSArray+Scheduler in UI/SchedulerUI/.
 

UI/Scheduler/GNUmakefile

@@ -10,6 +10,7 @@ SchedulerUI_LANGUAGES = English French German
 
 SchedulerUI_OBJC_FILES =		\
 	SchedulerUIProduct.m		\
+	NSArray+Scheduler.m		\
 					\
 	UIxCalMainView.m		\
 					\

UI/Scheduler/UIxCalListingActions.m

@@ -39,6 +39,7 @@
 #import <SoObjects/Appointments/SOGoAppointmentFolder.h>
 
 #import "../SOGoUI/SOGoDateFormatter.h"
+#import "NSArray+Scheduler.h"
 
 #import "UIxCalListingActions.h"
 
@@ -326,6 +327,7 @@
 
       oldEvent = [events nextObject];
     }
+  [newEvents sortUsingSelector: @selector (compareEventsAscending:)];
 
   return [self _responseWithData: newEvents];
 }
@@ -398,6 +400,7 @@
 	}
       task = [tasks nextObject];
     }
+  [filteredTasks sortUsingSelector: @selector (compareTasksAscending:)];
 
   return [self _responseWithData: filteredTasks];
 }