amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 11:55:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: eed113f7d96f6250f99846d1a42c1b226da55165

Browse Source 
Monotone-Revision: 2512d33c93527cc0878865235de0bc639864f95b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-21T22:29:35
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-08-21 22:29:35 +00:00
parent 43a53e0567
commit f22dbd4b52
3 changed files with 101 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2006-08-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxCalAptListView.m ([UIxCalAptListView -startDate])
([UIxCalAptListView -endDate]): return the required dates needed
depending on the value given to the "filterpopup" url parameter.
* UI/Common/UIxToolbar.m ([UIxToolbar -buttonLabel]): reduced the
code by invoking UIxComponent's labelForKey:.
UI/Scheduler/UIxCalAptListView.h
+3
View File
@@ -29,6 +29,9 @@
@interface UIxCalAptListView : UIxCalView
{
NSCalendarDate *startDate;
NSCalendarDate *endDate;
NSDictionary *currentAppointment;
}
UI/Scheduler/UIxCalAptListView.m
+94 -10
View File
@@ -24,6 +24,7 @@
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
#import <NGExtensions/NSCalendarDate+misc.h>
#import <Appointments/SOGoAppointmentFolder.h>
#import <SOGoUI/SOGoDateFormatter.h>
@@ -32,15 +33,16 @@
@implementation UIxCalAptListView
// - (id) init
// {
// if ((self = [super init]))
// {
// allAppointments = nil;
// }
- (id) init
{
if ((self = [super init]))
{
startDate = nil;
endDate = nil;
}
// return self;
// }
return self;
}
- (void) setCurrentAppointment: (NSDictionary *) apt
{
@@ -52,14 +54,81 @@
return currentAppointment;
}
// @"view_all", nil,
// @"view_today", @"flags = 'seen' AND NOT (flags = 'deleted')",
// @"view_next7", @"flags = 'unseen' AND NOT (flags = 'deleted')",
// @"view_next14", @"flags = 'deleted'",
// @"view_next31", @"flags = 'flagged'",
// @"view_thismonth", @"flags = 'flagged'",
// @"view_future", @"flags = 'flagged'",
// @"view_selectedday", @"flags = 'flagged'",
// - (NSCalendarDate *)firstDayOfMonth;
// - (NSCalendarDate *)lastDayOfMonth;
- (NSCalendarDate *) startDate
{
return [NSCalendarDate dateWithTimeIntervalSince1970: 0];
NSString *filterPopup;
if (!startDate)
{
filterPopup = [self queryParameterForKey: @"filterpopup"];
if (filterPopup
&& [filterPopup length] > 0
&& ![filterPopup isEqualToString: @"view_all"])
{
if ([filterPopup isEqualToString: @"view_thismonth"])
startDate = [[NSCalendarDate date] firstDayOfMonth];
else if ([filterPopup isEqualToString: @"view_selectedday"])
startDate = [self selectedDate];
else
startDate = [NSCalendarDate date];
startDate = [startDate beginOfDay];
}
else
startDate = [NSCalendarDate dateWithTimeIntervalSince1970: 0];
}
return startDate;
}
- (NSCalendarDate *) endDate
{
return [NSCalendarDate dateWithTimeIntervalSince1970: 0x7fffffff];
NSCalendarDate *today;
NSString *filterPopup;
if (!endDate)
{
filterPopup = [self queryParameterForKey: @"filterpopup"];
if (filterPopup
&& [filterPopup length] > 0
&& ![filterPopup isEqualToString: @"view_all"]
&& ![filterPopup isEqualToString: @"view_future"])
{
if ([filterPopup isEqualToString: @"view_thismonth"])
endDate = [[NSCalendarDate date] lastDayOfMonth];
else if ([filterPopup isEqualToString: @"view_selectedday"])
endDate = [self selectedDate];
else
{
today = [NSCalendarDate date];
if ([filterPopup isEqualToString: @"view_today"])
endDate = today;
else if ([filterPopup isEqualToString: @"view_next7"])
endDate = [today dateByAddingYears: 0 months: 0 days: 7];
else if ([filterPopup isEqualToString: @"view_next14"])
endDate = [today dateByAddingYears: 0 months: 0 days: 14];
else if ([filterPopup isEqualToString: @"view_next31"])
endDate = [today dateByAddingYears: 0 months: 1 days: 0];
}
endDate = [endDate endOfDay];
}
else
endDate = [NSCalendarDate dateWithTimeIntervalSince1970: 0x7fffffff];
}
return endDate;
}
- (SOGoDateFormatter *) itemDateFormatter
@@ -73,6 +142,21 @@
return fmt;
}
- (NSString *) currentTitle
{
NSString *fullTitle, *title;
fullTitle = [currentAppointment objectForKey: @"title"];
if ([fullTitle length] > 49)
title = [NSString stringWithFormat: @"%@...",
[[currentAppointment objectForKey: @"title"]
substringToIndex: 50]];
else
title = fullTitle;
return title;
}
- (NSString *) currentStartTime
{
NSCalendarDate *date;