LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'alexcloutier-feat/searchCapabilities'

Browse source
This commit is contained in:
Francis Lachapelle 2014-05-16 16:30:24 -04:00
parent 819d0641b7 6b72a8d126
commit c2d3a827bd
10 changed files with 748 additions and 589 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SoObjects/Appointments/SOGoAppointmentFolder.m
View file

@ -1280,12 +1280,19 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
[baseWhere addObject: privacySQLString];
if ([title length])
[baseWhere
addObject: [NSString stringWithFormat: @"c_title isCaseInsensitiveLike: '%%%@%%'",
[title stringByReplacingString: @"'" withString: @"\\'\\'"]]];
if ([filters length])
[baseWhere addObject: [NSString stringWithFormat: @"(%@)", filters]];
{
if ([filters isEqualToString:@"title_Category_Location"] || [filters isEqualToString:@"entireContent"])
{
[baseWhere addObject: [NSString stringWithFormat: @"(c_title isCaseInsensitiveLike: '%%%@%%' OR c_category isCaseInsensitiveLike: '%%%@%%' OR c_location isCaseInsensitiveLike: '%%%@%%')",
[title stringByReplacingString: @"'" withString: @"\\'\\'"],
[title stringByReplacingString: @"'" withString: @"\\'\\'"],
[title stringByReplacingString: @"'" withString: @"\\'\\'"]]];
}
}
else
[baseWhere addObject: [NSString stringWithFormat: @"c_title isCaseInsensitiveLike: '%%%@%%'",
[title stringByReplacingString: @"'" withString: @"\\'\\'"]]];
/* prepare mandatory fields */

8
UI/Scheduler/English.lproj/Localizable.strings
View file

@ -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";

4
UI/Scheduler/UIxCalFilterPanel.m
View file

@ -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];
}
}

3
UI/Scheduler/UIxCalListingActions.h
View file

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

137
UI/Scheduler/UIxCalListingActions.m
View file

@ -37,6 +37,8 @@
#import <NGCards/iCalPerson.h>
#import <NGCards/iCalTimeZone.h>
#import <NGCards/iCalDateTime.h>
#import <NGCards/iCalCalendar.h>
#import <NGCards/iCalObject.h>
#import <NGExtensions/NGCalendarDateRange.h>
#import <NGExtensions/NSCalendarDate+misc.h>
@ -211,7 +213,8 @@ static NSArray *tasksFields = nil;
user = [context activeUser];
userLogin = [user login];
title = [request formValueForKey: @"search"];
criteria = [request formValueForKey: @"search"];
value = [request formValueForKey: @"value"];
param = [request formValueForKey: @"filterpopup"];
if ([param length])
{
@ -308,14 +311,18 @@ static NSArray *tasksFields = nil;
forComponentOfType: (NSString *) component
{
NSEnumerator *folders, *currentInfos;
SOGoAppointmentFolder *currentFolder;
NSMutableDictionary *newInfo;
NSMutableArray *infos, *newInfoForComponent;
NSMutableArray *infos, *newInfoForComponent, *quickInfos, *allInfos, *quickInfosName;
NSNull *marker;
NSString *owner, *role, *calendarName, *filters, *iCalString;
NSRange match;
iCalCalendar *calendar;
iCalObject *master;
SOGoAppointmentFolder *currentFolder;
SOGoAppointmentFolders *clientObject;
SOGoUser *ownerUser;
NSString *owner, *role, *calendarName;
BOOL isErasable, folderIsRemote;
BOOL isErasable, folderIsRemote, quickInfosFlag = NO;
id currentInfo;
int i, count;
@ -328,17 +335,77 @@ static NSArray *tasksFields = nil;
{
if ([currentFolder isActive])
{
folderIsRemote
= [currentFolder isKindOfClass: [SOGoWebAppointmentFolder class]];
currentInfos
= [[currentFolder fetchCoreInfosFrom: startDate
folderIsRemote = [currentFolder isKindOfClass: [SOGoWebAppointmentFolder class]];
if ([criteria isEqualToString:@"title_Category_Location"])
currentInfos = [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: title
title: value
component: component
additionalFilters: criteria] objectEnumerator];
else if ([criteria isEqualToString:@"entireContent"])
{
// First research : Through the quick table inside the location, category and title columns
quickInfos = [currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: value
component: component
additionalFilters: criteria];
// Save the c_name in another array to compare with
if ([quickInfos count] > 0)
{
quickInfosFlag = YES;
quickInfosName = [NSMutableArray arrayWithCapacity:[quickInfos count]];
for (i = 0; i < [quickInfos count]; i++)
[quickInfosName addObject:[[quickInfos objectAtIndex:i] objectForKey:@"c_name"]];
}
// Second research : Every objects except for those already in the quickInfos array
allInfos = [currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: nil
component: component];
if (quickInfosFlag == YES)
{
for (i = ([allInfos count] - 1); i >= 0 ; i--) {
if([quickInfosName containsObject:[[allInfos objectAtIndex:i] objectForKey:@"c_name"]])
[allInfos removeObjectAtIndex:i];
}
}
for (i = 0; i < [allInfos count]; i++)
{
iCalString = [[allInfos objectAtIndex:i] objectForKey:@"c_content"];
calendar = [iCalCalendar parseSingleFromSource: iCalString];
master = [calendar firstChildWithTag:component];
if (master) {
if ([[master comment] length] > 0)
{
match = [[master comment] rangeOfString:value options:NSCaseInsensitiveSearch];
if (match.length > 0) {
[quickInfos addObject:[allInfos objectAtIndex:i]];
}
}
}
}
currentInfos = [quickInfos objectEnumerator];
}
else
currentInfos = [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: value
component: component] objectEnumerator];
owner = [currentFolder ownerInContext: context];
ownerUser = [SOGoUser userWithLogin: owner];
isErasable = ([owner isEqualToString: userLogin]
|| [[currentFolder aclsForUser: userLogin] containsObject: SOGoRole_ObjectEraser]);
isErasable = ([owner isEqualToString: userLogin] || [[currentFolder aclsForUser: userLogin] containsObject: SOGoRole_ObjectEraser]);
while ((newInfo = [currentInfos nextObject]))
{
if ([fields containsObject: @"editable"])
@ -350,12 +417,9 @@ static NSArray *tasksFields = nil;
else
{
// Identifies whether the active user can edit the event.
role =
[currentFolder roleForComponentsWithAccessClass:
[[newInfo objectForKey: @"c_classification"] intValue]
role = [currentFolder roleForComponentsWithAccessClass:[[newInfo objectForKey: @"c_classification"] intValue]
forUser: userLogin];
if ([role isEqualToString: @"ComponentModifier"]
|| [role length] == 0)
if ([role isEqualToString: @"ComponentModifier"] || [role length] == 0)
[newInfo setObject: [NSNumber numberWithInt: 1]
forKey: @"editable"];
else
@ -383,6 +447,7 @@ static NSArray *tasksFields = nil;
else
[newInfo setObject: [NSNumber numberWithInt: 0]
forKey: @"erasable"];
[newInfo setObject: [currentFolder nameInContainer]
forKey: @"c_folder"];
[newInfo setObject: [currentFolder ownerInContext: context]
@ -573,8 +638,7 @@ static NSArray *tasksFields = nil;
return [self _responseWithData: newEvents];
}
static inline void
_feedBlockWithDayBasedData (NSMutableDictionary *block, unsigned int start,
static inline void _feedBlockWithDayBasedData (NSMutableDictionary *block, unsigned int start,
unsigned int end, unsigned int dayStart)
{
unsigned int delta, quarterStart, length, swap;
@ -832,8 +896,7 @@ _userStateInEvent (NSArray *event)
return blocks;
}
static inline unsigned int
_computeMaxBlockSiblings (NSArray *block)
static inline unsigned int _computeMaxBlockSiblings (NSArray *block)
{
unsigned int count, max, maxSiblings, siblings;
NSNumber *nbrEvents;
@ -854,8 +917,7 @@ _computeMaxBlockSiblings (NSArray *block)
return maxSiblings;
}
static inline void
_propagateBlockSiblings (NSArray *block, NSNumber *maxSiblings)
static inline void _propagateBlockSiblings (NSArray *block, NSNumber *maxSiblings)
{
unsigned int count, max;
NSMutableDictionary *event;
@ -872,8 +934,7 @@ _propagateBlockSiblings (NSArray *block, NSNumber *maxSiblings)
}
/* this requires two vertical passes */
static inline void
_computeBlocksSiblings (NSArray *blocks)
static inline void _computeBlocksSiblings (NSArray *blocks)
{
NSArray *currentBlock;
unsigned int count, max, maxSiblings;
@ -888,8 +949,7 @@ _computeBlocksSiblings (NSArray *blocks)
}
}
static inline void
_computeBlockPosition (NSArray *block)
static inline void _computeBlockPosition (NSArray *block)
{
unsigned int count, max, j, siblings;
NSNumber *position;
@ -1065,7 +1125,7 @@ _computeBlocksPosition (NSArray *blocks)
{
NSMutableArray *filteredTasks, *filteredTask;
NSString *sort, *ascending;
NSString *statusFlag;
NSString *statusFlag, *tasksView;
SOGoUserSettings *us;
NSEnumerator *tasks;
NSArray *task;
@ -1073,11 +1133,17 @@ _computeBlocksPosition (NSArray *blocks)
unsigned int endDateStamp;
BOOL showCompleted;
int statusCode;
int startSecs;
int endsSecs;
filteredTasks = [NSMutableArray array];
[self _setupContext];
startSecs = (unsigned int) [startDate timeIntervalSince1970];
endsSecs = (unsigned int) [endDate timeIntervalSince1970];
tasksView = [request formValueForKey: @"filterpopup"];
#warning see TODO in SchedulerUI.js about "setud"
showCompleted = [[request formValueForKey: @"show-completed"] intValue];
if ([request formValueForKey: @"setud"])
@ -1089,6 +1155,7 @@ _computeBlocksPosition (NSArray *blocks)
tasks = [[self _fetchFields: tasksFields
forComponentOfType: @"vtodo"] objectEnumerator];
while ((task = [tasks nextObject]))
{
statusCode = [[task objectAtIndex: 3] intValue];
@ -1102,6 +1169,20 @@ _computeBlocksPosition (NSArray *blocks)
if (endDateStamp > 0)
[filteredTask addObject: [self _formattedDateForSeconds: endDateStamp
forAllDay: NO]];
if (([tasksView isEqualToString:@"view_today"] ||
[tasksView isEqualToString:@"view_next7"] ||
[tasksView isEqualToString:@"view_next14"] ||
[tasksView isEqualToString:@"view_next31"] ||
[tasksView isEqualToString:@"view_thismonth"]) && ((endDateStamp <= endsSecs) && (endDateStamp >= startSecs)))
[filteredTasks addObject: filteredTask];
else if ([tasksView isEqualToString:@"view_all"])
[filteredTasks addObject: filteredTask];
else if (([tasksView isEqualToString:@"view_overdue"]) && ([[filteredTask objectAtIndex:12] isEqualToString:@"overdue"]))
[filteredTasks addObject: filteredTask];
else if ([tasksView isEqualToString:@"view_incomplete"] && (![[filteredTask objectAtIndex:12] isEqualToString:@"completed"]))
[filteredTasks addObject: filteredTask];
else if ([tasksView isEqualToString:@"view_not_started"] && ([[[filteredTask objectAtIndex:3] stringValue] isEqualToString:@"0"]))
[filteredTasks addObject: filteredTask];
}
}

27
UI/Scheduler/UIxCalMainView.m
View file

@ -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;

10
UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
View file

@ -3,12 +3,14 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:label="OGo:label"
>
xmlns:label="OGo:label">
<div class="filterPanel" data-search="events">
<div class="menu" id="eventSearchMenu">
<ul class="choiceMenu">
<li data-option="title"><var:string label:value="Title or Description"/></li>
<li data-option="title"><var:string label:value="Title"/></li>
<li data-option="title_Category_Location"><var:string label:value="Title, category or location"/></li>
<li data-option="entireContent"><var:string label:value="Entire content"/></li>
</ul>
</div>
<span class="searchBox" style="float: right">
@ -25,6 +27,6 @@
item="filter" string="filterLabel" value="filter"
selection="selectedFilter"
const:name="filterpopup"
const:onchange="return onListFilterChange();" />
const:onchange="return onEventsListFilterChange();" />
</div>
</container>

21
UI/Templates/SchedulerUI/UIxCalMainView.wox
View file

@ -165,6 +165,7 @@
<td id="eventStartHeader" class="headerCell headerDateTime sortableTableHeader"><var:string label:value="Start"/></td>
<td id="eventEndHeader" class="headerCell headerDateTime sortableTableHeader"><var:string label:value="End"/></td>
<td id="eventLocationHeader" class="headerCell headerLocation sortableTableHeader"><var:string label:value="Location"/></td>
<td id="eventCategoryHeader" class="headerCell headerCategory sortableTableHeader"><var:string label:value="Category"/></td>
<td id="eventCalendarNameHeader" class="headerCell headerCalendarName sortableTableHeader"><var:string label:value="Calendar"/></td>
</tr>
</thead>
@ -175,7 +176,9 @@
<div class="filterPanel" data-search="tasks">
<div class="menu" id="taskSearchMenu">
<ul class="choiceMenu">
<li data-option="title"><var:string label:value="Title or Description"/></li>
<li data-option="title"><var:string label:value="Title"/></li>
<li data-option="title_Category_Location"><var:string label:value="Title, category or location"/></li>
<li data-option="entireContent"><var:string label:value="Entire content"/></li>
</ul>
</div>
<span class="searchBox" style="float: right">
@ -184,7 +187,19 @@
autocomplete="off" type="text"
menuid="taskSearchMenu" />
</span>
<input id="showHideCompletedTasks" type="checkbox" class="checkBox" var:checked="showCompletedTasks"/><var:string label:value="Show completed tasks"/>
<span>
<var:string label:value="View:" />
<var:popup list="tasksFilters"
const:id="tasksFilterpopup"
item="taskFilter" string="tasksFilterLabel" value="taskFilter"
selection="selectedTasksFilter"
const:name="tasksFilterpopup"
const:onchange="return onTasksListFilterChange();" />
</span>
<span>
<input id="showHideCompletedTasks" type="checkbox" class="checkBox" var:checked="showCompletedTasks"/>
<var:string label:value="Show completed tasks" />
</span>
</div>
<table id="tasksList" cellspacing="0">
<thead>
@ -194,7 +209,7 @@
<td id="taskTitleHeader" class="headerCell headerTitle sortableTableHeader"><var:string label:value="Title"/></td>
<td id="taskEndHeader" class="headerCell headerDateTime sortableTableHeader"><var:string label:value="Due Date"/></td>
<td id="taskLocationHeader" class="headerCell headerLocation sortableTableHeader"><var:string label:value="Location"/></td>
<td id="taskCategoryHeader" class="headerCell headerLocation sortableTableHeader"><var:string label:value="Category"/></td>
<td id="taskCategoryHeader" class="headerCell headerCategory sortableTableHeader"><var:string label:value="Category"/></td>
<td id="taskCalendarNameHeader" class="headerCell headerCalendarName sortableTableHeader"><var:string label:value="Calendar"/></td>
</tr>
</thead>

63
UI/WebServerResources/SchedulerUI.js
View file

@ -1,4 +1,5 @@
var listFilter = 'view_today';
var eventListFilter = 'view_today';
var taskListFilter = 'view_today';
var listOfSelection = null;
var selectedCalendarCell = null;
@ -899,7 +900,7 @@ function performDeleteEventCallback(http) {
/* in dateselector */
function onDaySelect(node) {
var day = node.getAttribute('day');
var needRefresh = (listFilter == 'view_selectedday'
var needRefresh = (eventListFilter == 'view_selectedday'
&& day != currentDay);
var td = $(node).getParentWithTagName("td");
@ -932,7 +933,7 @@ function onDateSelectorGotoMonth(event) {
function onCalendarGotoDay(node) {
var day = node.getAttribute("date");
var needRefresh = (listFilter == 'view_selectedday' && day != currentDay);
var needRefresh = (eventListFilter == 'view_selectedday' && day != currentDay);
changeDateSelectorDisplay(day);
changeCalendarDisplay( { "day": day } );
@ -1042,6 +1043,12 @@ function eventsListCallback(http) {
if (data[i][7])
td.update(data[i][7]); // location
td = createElement("td");
row.appendChild(td);
td.observe("mousedown", listRowMouseDownHandler, true);
if (data[i][10])
td.update(data[i][10]); // category
td = createElement("td");
row.appendChild(td);
td.observe("mousedown", listRowMouseDownHandler, true);
@ -2242,41 +2249,44 @@ function refreshCurrentFolder(id) {
/* refreshes the "unifinder" list */
function refreshEvents() {
var titleSearch;
var specificSearch;
var value = search["events"]["value"];
if (value && value.length)
titleSearch = "&search=" + escape(value.utf8encode());
specificSearch = ("&search=" + search["events"]["criteria"]
+ "&value=" + escape(value.utf8encode()));
else
titleSearch = "";
specificSearch = "";
refreshAlarms();
return _loadEventHref("eventslist?asc=" + sorting["event-ascending"]
+ "&sort=" + sorting["event-attribute"]
+ "&day=" + currentDay
+ titleSearch
+ "&filterpopup=" + listFilter);
+ specificSearch
+ "&filterpopup=" + eventListFilter);
}
function refreshTasks(setUserDefault) {
var titleSearch;
var specificSearch;
var value = search["tasks"]["value"];
if (value && value.length)
titleSearch = "&search=" + escape(value.utf8encode());
specificSearch = ("&search=" + search["tasks"]["criteria"]
+ "&value=" + escape(value.utf8encode()));
else
titleSearch = "";
specificSearch = "";
if (setUserDefault == 1)
titleSearch += "&setud=1";
specificSearch += "&setud=1";
refreshAlarms();
return _loadTasksHref("taskslist?show-completed=" + showCompletedTasks
+ "&asc=" + sorting["task-ascending"]
+ "&sort=" + sorting["task-attribute"]
+ titleSearch);
+ specificSearch
+ "&filterpopup=" + taskListFilter);
}
function refreshEventsAndDisplay() {
@ -2284,15 +2294,26 @@ function refreshEventsAndDisplay() {
changeCalendarDisplay();
}
function onListFilterChange() {
function onEventsListFilterChange() {
var node = $("filterpopup");
listFilter = node.value;
// log ("listFilter = " + listFilter);
eventListFilter = node.value;
return refreshEvents();
}
function onTasksListFilterChange() {
var node = $("tasksFilterpopup");
taskListFilter = node.value;
$("showHideCompletedTasks").disabled = taskListFilter == "view_overdue" ||
taskListFilter == "view_incomplete" ||
taskListFilter == "view_not_started";
return refreshTasks();
}
function selectMonthInMenu(menu, month) {
var entries = $(menu).select("LI");
for (i = 0; i < entries.length; i++) {
@ -2487,7 +2508,7 @@ function onCalendarSelectEvent(event, willShowContextualMenu) {
function onCalendarSelectDay(event) {
var day = this.getAttribute("day");
var needRefresh = (listFilter == 'view_selectedday' && day != currentDay);
var needRefresh = (eventListFilter == 'view_selectedday' && day != currentDay);
setSelectedDayDate(day);
changeDateSelectorDisplay(day);
@ -2771,12 +2792,12 @@ function getMenus() {
onCalendarNew, onCalendarRemove,
"-", onCalendarExport, onCalendarImport,
null, "-", null, "-", onMenuSharing);
menus["eventSearchMenu"] = new Array(setSearchCriteria);
menus["eventSearchMenu"] = new Array(setSearchCriteria, setSearchCriteria, setSearchCriteria);
menus["tasksListMenu"] = new Array (editEvent, newTask, "-",
marksTasksAsCompleted, deleteEvent, "-",
onMenuRawTask);
menus["taskSearchMenu"] = new Array(setSearchCriteria);
menus["taskSearchMenu"] = new Array(setSearchCriteria, setSearchCriteria, setSearchCriteria);
var calendarsMenu = $("calendarsMenu");
if (calendarsMenu)
@ -3283,6 +3304,7 @@ function configureLists() {
var input = $("showHideCompletedTasks");
input.observe("click", onShowCompletedTasks);
if (showCompletedTasks)
input.checked = true;
@ -3444,7 +3466,7 @@ function initScheduler() {
if (!$(document.body).hasClassName("popup")) {
var node = $("filterpopup");
listFilter = node.value;
eventListFilter = node.value;
var tabsContainer = $("schedulerTabs");
var controller = new SOGoTabsController();
@ -3457,6 +3479,7 @@ function initScheduler() {
else {
showCompletedTasks = 0;
}
initDateSelectorEvents();
initCalendarSelector();
configureSearchField();

3
UI/WebServerResources/generic.css
View file

@ -428,7 +428,8 @@ TD.headerTitle
{ width: 20%; }
TD.headerLocation,
TD.headerCalendarName
TD.headerCalendarName,
TD.headerCategory
{ min-width: 15em;
width: 15em; }