amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-14 01:38:51 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: b0ba815a88a1243ad497187fab3660f3ebef9f27

Browse Source 
Monotone-Revision: 7e4012769b937d5a36d8043bf2b2b1392a61a376

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-04T23:15:25
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-10-04 23:15:25 +00:00
parent 51e4e4046d
commit f28a25cb70
7 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
UI/Scheduler/UIxAppointmentEditor.m
View File

@@ -20,7 +20,9 @@
*/
#import <NGCards/NSString+NGCards.h>
#import <NGCards/NSCalendarDate+NGCards.h>
#import <SOGo/NSCalendarDate+SOGo.h>
#import <SOGoUI/UIxComponent.h>
/* TODO: CLEAN UP */
@@ -97,10 +99,6 @@
#import <Appointments/SOGoAppointmentObject.h>
#import "UIxComponent+Agenor.h"
@interface NSDate(UsedPrivates)
- (NSString *)icalString; // TODO: this is in NGCards
@end
@implementation UIxAppointmentEditor
+ (int)version {
@@ -521,9 +519,9 @@
s = [self iCalParticipantsAndResourcesStringFromQueryParameters];
template = [NSString stringWithFormat:iCalStringTemplate,
[[self clientObject] nameInContainer],
[[NSCalendarDate date] icalString],
[lStartDate icalString],
[lEndDate icalString],
[[NSCalendarDate date] iCalFormattedString],
[lStartDate iCalFormattedString],
[lEndDate iCalFormattedString],
[self transparency],
[self iCalOrganizerString],
s];
@@ -685,15 +683,6 @@
/* save */
/* returned dates are in GMT */
- (NSCalendarDate *)_dateFromString:(NSString *)_str {
NSCalendarDate *date;
date = [NSCalendarDate dateWithString:_str
calendarFormat:@"%Y-%m-%d %H:%M %Z"];
[date setTimeZone:[[self clientObject] serverTimeZone]];
return date;
}
- (NSArray *)getICalPersonsFromFormValues:(NSArray *)_values
treatAsResource:(BOOL)_isResource
{
@@ -764,16 +753,23 @@
{
NSString *s;
iCalRecurrenceRule *rrule;
NSTimeZone *uTZ;
if ((startDate = [[_appointment startDate] copy]) == nil)
startDate = [[[NSCalendarDate date] hour:11 minute:0] copy];
if ((endDate = [[_appointment endDate] copy]) == nil) {
if ((startDate = [_appointment startDate]) == nil)
startDate = [[NSCalendarDate date] hour:11 minute:0];
if ((endDate = [_appointment endDate]) == nil) {
endDate =
[[startDate hour:[startDate hourOfDay] + 1 minute:0] copy];
[startDate hour:[startDate hourOfDay] + 1 minute:0];
}
[startDate setTimeZone:[[self clientObject] userTimeZone]];
[endDate setTimeZone:[[self clientObject] userTimeZone]];
uTZ = [[self clientObject] userTimeZone];
[startDate setTimeZone: uTZ];
[endDate setTimeZone: uTZ];
// startDate = [startDate adjustedDate];
// endDate = [endDate adjustedDate];
[startDate retain];
[endDate retain];
title = [[_appointment summary] copy];
location = [[_appointment location] copy];
comment = [[_appointment comment] copy];
@@ -854,11 +850,6 @@
return appointment;
}
- (void) loadValuesFromICalString: (NSString *) _iCalString
{
[self loadValuesFromAppointment: [self appointmentFromString: _iCalString]];
}
/* contact editor compatibility */
- (void)setContentString:(NSString *)_s {
@@ -868,11 +859,6 @@
return [self iCalStringTemplate];
}
- (void)loadValuesFromContentString:(NSString *)_s {
[self loadValuesFromICalString:_s];
}
/* access */
- (BOOL) isMyApt
@@ -982,7 +968,7 @@
ical = [self contentStringTemplate];
[self setContentString:ical];
[self loadValuesFromContentString:ical];
[self loadValuesFromAppointment: [self appointmentFromString: ical]];
if (![self canEditApt]) {
/* TODO: we need proper ACLs */