search capabilites

UI/Scheduler/English.lproj/Localizable.strings

@@ -225,8 +225,14 @@
 "view_future" = "All Future Events";
 "view_selectedday" = "Selected Day";
 
+"view_current" = "Current tasks";
+"view_not_started" = "Not started tasks";
+"view_overdue" = "Overdue tasks";
+"view_incomplete" = "Incomplete tasks";
+
 "View:" = "View:";
-"Title or Description" = "Title or Description";
+"Title, category or location" = "Title, category or location";
+"Entire content" = "Entire content";
 
 "Search" = "Search";
 "Search attendees" = "Search attendees";

UI/Scheduler/UIxCalFilterPanel.m

@@ -39,14 +39,14 @@ static NSArray *filters = nil;
 + (void) initialize
 {
   static NSString *quals[]
-    = { // @"view_all",
+    = {@"view_all",
        @"view_today", @"view_next7", @"view_next14",
        @"view_next31", @"view_thismonth", @"view_future",
        @"view_selectedday" };
 
   if (!filters)
     {
-      filters = [NSArray arrayWithObjects: quals count: 7];
+      filters = [NSArray arrayWithObjects: quals count: 8];
       [filters retain];
     }
 }

UI/Scheduler/UIxCalListingActions.h

@@ -40,7 +40,8 @@
   NSMutableDictionary *componentsData;
   NSCalendarDate *startDate;
   NSCalendarDate *endDate;
-  NSString *title;
+  NSString *value;
+  NSString *criteria;
   NSString *userLogin;
   BOOL dayBasedView;
   WORequest *request;

UI/Scheduler/UIxCalMainView.m

@@ -1,8 +1,7 @@
 /* UIxCalMainView.m - this file is part of SOGo
  *
- * Copyright (C) 2006-2009 Inverse inc.
+ * Copyright (C) 2006-2014 Inverse inc.
  *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -132,6 +131,30 @@
   return yearMenuItems;
 }
 
+- (NSArray *) tasksFilters
+{
+  return [NSArray arrayWithObjects: @"view_all", @"view_today", @"view_next7",
+                                    @"view_next14", @"view_next31", @"view_thismonth",
+                                    @"view_not_started", @"view_overdue", @"view_incomplete", nil];
+}
+
+- (NSString *) tasksFilterLabel
+{
+  return [self labelForKey: [self valueForKey:@"taskFilter"]];
+}
+
+- (NSString *) selectedTasksFilter
+{
+  NSString *selectedFilter;
+  
+  selectedFilter = [self queryParameterForKey: @"tasksFilterpopup"];
+
+  if (![selectedFilter length])
+    selectedFilter = @"view_today";
+  
+  return selectedFilter;
+}
+
 - (void) setYearMenuItem: (NSNumber *) aYearMenuItem
 {
   yearMenuItem = aYearMenuItem;