Monotone-Parent: 9ae32cf8559ea63dc0055f1841da04821ed5e5ee

Monotone-Revision: dd288587ff94f2fc40c82dd8e32cf52f45b50841 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-04T23:12:08 Monotone-Branch: ca.inverse.sogo
2026-07-10 10:55:08 +00:00 · 2006-10-04 23:12:08 +00:00
parent c7e92ce2d7
commit 198ca8e76e
5 changed files with 94 additions and 7 deletions
@@ -34,6 +34,7 @@ libSOGo_HEADER_FILES = \
 	WOContext+Agenor.h		\
 	NSString+URL.h			\
 	NSDictionary+URL.h		\
+	NSCalendarDate+SOGo.h		\
 	\
 	SOGoAuthenticator.h		\
 	SOGoUser.h			\
@@ -54,7 +55,7 @@ libSOGo_OBJC_FILES = \
 	AgenorUserDefaults.m		\
 	NSDictionary+URL.m		\
 	NSString+URL.m			\
-	\
+	NSCalendarDate+SOGo.m		\
 	\
 	SOGoAuthenticator.m		\
 	SOGoUser.m			\
@@ -0,0 +1,48 @@
+/* NSCalendarDate+SOGo.h - this file is part of SOGo
+   Copyright (C) 2000-2004 SKYRIX Software AG
+
+   This file is part of OGo
+
+   OGo is free software; you can redistribute it and/or modify it under
+   the terms of the GNU Lesser General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+   License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with OGo; see the file COPYING.  If not, write to the
+   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+*/
+
+#ifndef NSCALENDARDATE_SCHEDULER_H
+#define NSCALENDARDATE_SCHEDULER_H
+
+#import <Foundation/NSCalendarDate.h>
+
+@class NSString;
+@class NSTimeZone;
+
+@interface NSCalendarDate (SOGoExtensions)
+
+ (id) dateFromShortDateString: (NSString *) dateString
+            andShortTimeString: (NSString *) timeString
+                    inTimeZone: (NSTimeZone *) timeZone;
+
+/* a date tuned to its timezone when initialized with local values */
+- (NSCalendarDate *) adjustedDate;
+- (NSCalendarDate *) driftedDate;
+
+- (BOOL) isDateInSameMonth: (NSCalendarDate *) _other;
+- (NSCalendarDate *) dayOfWeeK: (unsigned) _day
+              offsetFromSunday: (unsigned) _off;
+- (NSCalendarDate *) sundayOfWeek;
+- (NSString *) shortDateString;
+
+@end
+
+#endif /* NSCALENDARDATE_SCHEDULER_H */
@@ -0,0 +1,133 @@
+/* NSCalendarDate+SOGo.m - this file is part of SOGo
+   Copyright (C) 2000-2004 SKYRIX Software AG
+
+   This file is part of OGo
+
+   OGo is free software; you can redistribute it and/or modify it under
+   the terms of the GNU Lesser General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+   License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with OGo; see the file COPYING.  If not, write to the
+   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+*/
+
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "NSCalendarDate+SOGo.h"
+
+@implementation NSCalendarDate (SOGoExtensions)
+
+ (id) dateFromShortDateString: (NSString *) dateString
+            andShortTimeString: (NSString *) timeString
+                    inTimeZone: (NSTimeZone *) timeZone
+{
+  unsigned int year, month, day, hour, minute, total;
+  NSCalendarDate *cDate, *tmpDate;
+
+  if (dateString && [dateString length] == 8)
+    {
+      total = [dateString intValue];
+      year = total / 10000;
+      total -= year * 10000;
+      month = total / 100;
+      day = total - (month * 100);
+    }
+  else
+    {
+      tmpDate = [NSCalendarDate calendarDate];
+      tmpDate = [tmpDate addYear: 0 month: 0 day: 0 hour: 0 minute: 0
+                         second: [timeZone secondsFromGMT]];
+      year = [tmpDate yearOfCommonEra];
+      month = [tmpDate monthOfYear];
+      day = [tmpDate dayOfMonth];
+    }
+
+  if (timeString && [timeString length] == 4)
+    {
+      total = [timeString intValue];
+      hour = total / 100;
+      minute = total - (hour * 100);
+    }
+  else
+    {
+      hour = 12;
+      minute = 0;
+    }
+
+  cDate = [self dateWithYear: year month: month day: day
+                hour: hour minute: minute second: 0
+                timeZone: timeZone];
+
+  return [cDate adjustedDate];
+}
+
+- (NSCalendarDate *) adjustedDate
+{
+  NSTimeZone *dTZ;
+
+  dTZ = [self timeZone];
+
+  return [self addYear: 0 month: 0 day: 0 hour: 0 minute: 0
+               second: -[dTZ secondsFromGMT]];
+}
+
+- (NSCalendarDate *) driftedDate
+{
+  NSTimeZone *dTZ;
+
+  dTZ = [self timeZone];
+
+  return [self addYear: 0 month: 0 day: 0 hour: 0 minute: 0
+               second: [dTZ secondsFromGMT]];
+}
+
+- (BOOL) isDateInSameMonth: (NSCalendarDate *) _other
+{
+  return (([_other yearOfCommonEra] == [self yearOfCommonEra]) &&
+          ([_other monthOfYear] == [self monthOfYear]));
+}
+
+- (NSCalendarDate *) dayOfWeeK: (unsigned) _day 
+              offsetFromSunday: (unsigned) _offset
+{
+  unsigned dayOfWeek, distance;
+    
+  /* perform "locale" correction */
+  dayOfWeek = (7 + [self dayOfWeek] - _offset) % 7;
+
+  _day = (_day % 7);
+  if(_day == dayOfWeek)
+    return self;
+
+  distance = _day - dayOfWeek;
+  return [self dateByAddingYears:0 months:0 days:distance];
+}
+
+/* this implies that monday is the start of week! */
+
+- (NSCalendarDate *) sundayOfWeek
+{
+  return [self dayOfWeeK:6 offsetFromSunday:1];
+}
+
+- (NSString *) shortDateString
+{
+  NSString *str;
+
+  str = [NSString stringWithFormat: @"%.4d%.2d%.2d",
+                  [self yearOfCommonEra],
+                  [self monthOfYear],
+                  [self dayOfMonth]];
+
+  return str;
+}
+
+@end