amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-29 02:07:36 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 7fbc310dbd531814ded84ae464d6b9f7f793be37

Browse Source 
Monotone-Revision: 0a9e1bf24e4625bf9d860542966adcb75d55def5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-19T18:08:16
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-06-19 18:08:16 +00:00
parent b30b05dd21
commit 6aeca8b0b1
6 changed files with 47 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/UIxCalListingActions.m
+28 -10
View File
@@ -33,12 +33,12 @@
#import <NGExtensions/NSCalendarDate+misc.h>
#import <SoObjects/SOGo/SOGoUser.h>
#import <SoObjects/SOGo/SOGoDateFormatter.h>
#import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
#import <SoObjects/SOGo/NSArray+Utilities.h>
#import <SoObjects/SOGo/NSObject+Utilities.h>
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
#import "../SOGoUI/SOGoDateFormatter.h"
#import "NSArray+Scheduler.h"
#import "UIxCalListingActions.h"
@@ -47,7 +47,7 @@
- (id) initWithRequest: (WORequest *) newRequest
{
NSDictionary *locale;
SOGoUser *user;
if ((self = [super initWithRequest: newRequest]))
{
@@ -55,9 +55,9 @@
startDate = nil;
endDate = nil;
ASSIGN (request, newRequest);
locale = [[self context] valueForKey: @"locale"];
dateFormatter = [[SOGoDateFormatter alloc] initWithLocale: locale];
[dateFormatter setFullWeekdayNameAndDetails];
user = [[self context] activeUser];
dateFormatter = [user dateFormatterInContext: context];
ASSIGN (userTimeZone, [user timeZone]);
}
return self;
@@ -70,6 +70,7 @@
[componentsData release];
[startDate release];
[endDate release];
[userTimeZone release];
[super dealloc];
}
@@ -297,13 +298,29 @@
return response;
}
- (NSString *) _formattedDateForSeconds: (unsigned int) seconds
forAllDay: (BOOL) forAllDay
{
NSCalendarDate *date;
NSString *formattedDate;
date = [NSCalendarDate dateWithTimeIntervalSince1970: seconds];
[date setTimeZone: userTimeZone];
if (forAllDay)
formattedDate = [dateFormatter formattedDate: date];
else
formattedDate = [dateFormatter formattedDateAndTime: date];
return formattedDate;
}
- (WOResponse *) eventsListAction
{
NSArray *fields, *oldEvent;
NSEnumerator *events;
NSString *date;
NSMutableArray *newEvents, *newEvent;
unsigned int interval;
BOOL isAllDay;
[self _setupContext];
@@ -317,12 +334,13 @@
while (oldEvent)
{
newEvent = [NSMutableArray arrayWithArray: oldEvent];
isAllDay = [[oldEvent objectAtIndex: 7] boolValue];
interval = [[oldEvent objectAtIndex: 4] intValue];
date = [dateFormatter stringForSecondsSinceThe70s: interval];
[newEvent addObject: date];
[newEvent addObject: [self _formattedDateForSeconds: interval
forAllDay: isAllDay]];
interval = [[oldEvent objectAtIndex: 5] intValue];
date = [dateFormatter stringForSecondsSinceThe70s: interval];
[newEvent addObject: date];
[newEvent addObject: [self _formattedDateForSeconds: interval
forAllDay: isAllDay]];
[newEvents addObject: newEvent];
oldEvent = [events nextObject];