mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-03-30 10:32:47 +00:00
Monotone-Parent: ed1968caab1223af1ac0a41cf3fd4504a3dfa473
Monotone-Revision: 4d2697a35bcf482dfa9095d58087ffb8469eada5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-18T19:25:26 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -25,9 +25,11 @@
|
||||
#import <Foundation/NSKeyValueCoding.h>
|
||||
#import <Foundation/NSString.h>
|
||||
|
||||
#import <NGExtensions/NSCalendarDate+misc.h>
|
||||
|
||||
#import <EOControl/EOQualifier.h>
|
||||
|
||||
#import <NGExtensions/NSCalendarDate+misc.h>
|
||||
#import <SoObjects/SOGo/SOGoUser.h>
|
||||
|
||||
#include "UIxCalWeekView.h"
|
||||
|
||||
@@ -35,14 +37,18 @@
|
||||
|
||||
- (NSCalendarDate *) startDate
|
||||
{
|
||||
return [[[super startDate] mondayOfWeek] beginOfDay];
|
||||
NSCalendarDate *date;
|
||||
|
||||
date = [[context activeUser] firstDayOfWeekForDate: [super startDate]];
|
||||
|
||||
return [date beginOfDay];
|
||||
}
|
||||
|
||||
- (NSCalendarDate *) endDate
|
||||
{
|
||||
unsigned offset;
|
||||
|
||||
if([self shouldDisplayWeekend])
|
||||
if ([self shouldDisplayWeekend])
|
||||
offset = 7;
|
||||
else
|
||||
offset = 5;
|
||||
@@ -83,12 +89,17 @@
|
||||
{
|
||||
NSCalendarDate *date;
|
||||
NSString *format;
|
||||
unsigned int weekNbr;
|
||||
SOGoUser *user;
|
||||
|
||||
date = [[self startDate] dateByAddingYears: 0 months: 0 days: (offset * 7)
|
||||
hours:0 minutes: 0 seconds: 0];
|
||||
user = [context activeUser];
|
||||
date = [[self startDate] dateByAddingYears: 0 months: 0
|
||||
days: (offset * 7) + 6
|
||||
hours: 0 minutes: 0 seconds: 0];
|
||||
weekNbr = [user weekNumberForDate: date];
|
||||
format = [self labelForKey: @"Week %d"];
|
||||
|
||||
return [NSString stringWithFormat: format, [date weekOfYear]];
|
||||
return [NSString stringWithFormat: format, weekNbr];
|
||||
}
|
||||
|
||||
- (NSString *) weekBeforeLastWeekName
|
||||
|
||||
Reference in New Issue
Block a user