Merge pull request #96 from inverse-inc/feature/saveSortEventsTasks

Feature/save sort events tasks

UI/Scheduler/UIxCalListingActions.m

@@ -652,7 +652,7 @@ static NSArray *tasksFields = nil;
   return [self _responseWithData: data];
 }
 
-- (void) checkFilterValue
+- (void) saveEventFilterValue
 {
   NSString *filter;
   SOGoUserSettings *us;
@@ -668,6 +668,29 @@ static NSArray *tasksFields = nil;
   }
 }
 
+- (void) saveSortValue: (NSString *) submodule
+{
+  NSString *sort, *ascending;
+  SOGoUserSettings *us;
+  NSMutableDictionary *calendarSettings;
+  
+  sort = [[context request] formValueForKey: @"sort"];
+  ascending = [[context request] formValueForKey: @"asc"];
+  if ([sort length])
+  {
+    us = [[context activeUser] userSettings];
+    calendarSettings = [us objectForKey: @"Calendar"];
+    // Must create if it doesn't exist
+    if (!calendarSettings)
+    {
+      calendarSettings = [NSMutableDictionary dictionary];
+      [us setObject: calendarSettings forKey: @"Calendar"];
+    }
+    [calendarSettings setObject: [NSArray arrayWithObjects: [sort lowercaseString], [NSString stringWithFormat: @"%d", (ascending?1:0)], nil] forKey: submodule];
+    [us synchronize];
+  }
+}
+
 /**
  * @api {get} /so/:username/Calendar/eventslist List events
  * @apiVersion 1.0.0
@@ -720,7 +743,8 @@ static NSArray *tasksFields = nil;
   NSString *sort, *ascending;
   
   [self _setupContext];
-  [self checkFilterValue];
+  [self saveEventFilterValue];
+  [self saveSortValue: @"EventsSortingState"];
   
   newEvents = [NSMutableArray array];
   events = [[self _fetchFields: eventsFields
@@ -1412,6 +1436,7 @@ _computeBlocksPosition (NSArray *blocks)
   filteredTasks = [NSMutableArray array];
   
   [self _setupContext];
+  [self saveSortValue: @"TasksSortingState"];
   
   startSecs = (unsigned int) [startDate timeIntervalSince1970];
   endsSecs = (unsigned int) [endDate timeIntervalSince1970];