Monotone-Parent: 755524b00e9b962e6240a95f6bfdd559ca240f5a

Monotone-Revision: b37f3f6ae0b2c8936fa170defaec8e6b7c107b85

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-14T20:43:55
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2006-08-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/iCalPerson+UIx.m ([iCalPerson +personWithUid:]):
+	new class method that returns an iCalPerson based on the UID given
+	as param.
+
 	* UI/Contacts/UIxContactsListViewContainerBase.m: 
 	UIxContactsListViewContainer renamed to serve as a base class for
 	the contact lists in both the contact editor and the contact

UI/Scheduler/French.lproj/Localizable.strings

@@ -212,7 +212,7 @@
 "NOT IN OFFICE"		= "A l'exterieur";
 "MEETING"		= "Rêunion";
 "HOLIDAY"		= "Vacances";
-"PHONE CALL"		= "Rendez-vous téléphonique";
+"PHONE CALL"		= "Rendez-vous têlêphonique";
 
 /* validation errors */
 

UI/Scheduler/GNUmakefile

@@ -52,8 +52,7 @@ SchedulerUI_OBJC_FILES =		\
 
 SchedulerUI_RESOURCE_FILES += \
 	Version		\
-	product.plist	\
-	SchedulerUI.js
+	product.plist	
 
 SchedulerUI_RESOURCE_FILES += \
 	images/next_week.gif			\

UI/Scheduler/UIxAppointmentEditor.m

@@ -654,11 +654,12 @@
   method = [[self userFolderPath] stringByAppendingPathComponent:method];
 
   /* check if participants have already been provided */
-  ps     = [[[self context] request] formValueForKey:@"ps"];
-  if (ps) {
-    [self setQueryParameter:ps forKey:@"ps"];
-  }
-  else if ([[self clientObject] respondsToSelector:@selector(calendarUIDs)]) {
+  ps     = [self queryParameterForKey:@"ps"];
+//   if (ps) {
+//     [self setQueryParameter:ps forKey:@"ps"];
+//   }
+ if (!ps
+     && [[self clientObject] respondsToSelector:@selector(calendarUIDs)]) {
     AgenorUserManager *um;
     NSArray           *uids;
     NSMutableArray    *emails;

UI/Scheduler/UIxCalDateLabel.m

@@ -91,20 +91,20 @@
 }
 
 - (NSString *)weekLabel {
-  NSString *label;
+  NSString *label, *le;
   
-  label = [self localizedNameForMonthOfYear:[self->startDate monthOfYear]];
-  label = [NSString stringWithFormat:@"%@ %d",
-		    label,
-		    [self->startDate yearOfCommonEra]];
-  if ([self->startDate monthOfYear] != [self->endDate monthOfYear]) {
-    NSString *le;
-    
-    le = [self localizedNameForMonthOfYear:[self->endDate monthOfYear]];
-    label = [NSString stringWithFormat:@"<nobr>%@ / %@ %d</nobr>",
-		      label, le,
-		      [self->endDate yearOfCommonEra]];
-  }
+  if ([self->startDate monthOfYear] == [self->endDate monthOfYear])
+    label = [NSString stringWithFormat:@"%@ %d",
+                      [self localizedNameForMonthOfYear: [self->startDate monthOfYear]],
+                      [self->startDate yearOfCommonEra]];
+  else
+    {
+      le = [self localizedNameForMonthOfYear:[self->endDate monthOfYear]];
+      label = [NSString stringWithFormat:@"<nobr>%@ / %@ %d</nobr>",
+                        label, le,
+                        [self->endDate yearOfCommonEra]];
+    }
+
   return label;
 }
 

UI/Scheduler/UIxCalView.m

@@ -370,7 +370,7 @@ static BOOL shouldDisplayWeekend = NO;
 - (BOOL)shouldDisplayRejectedAppointments {
   NSString *bv;
   
-  bv = [[[self context] request] formValueForKey:@"dr"];
+  bv = [self queryParameterForKey: @"dr"];
   if (!bv) return NO;
   return [bv boolValue];
 }
@@ -427,17 +427,15 @@ static BOOL shouldDisplayWeekend = NO;
 - (id)redirectForUIDsAction {
   NSMutableString *uri;
   NSString   *uidsString, *loc, *prevMethod, *userFolderID;
-  WORequest  *req;
   id <WOActionResults> r;
   BOOL useGroups;
   unsigned index;
 
-  req = [[self context] request];
-
-  uidsString = [req formValueForKey:@"userUIDString"];
+  uidsString = [self queryParameterForKey:@"userUIDString"];
   uidsString = [uidsString stringByTrimmingWhiteSpaces];
+  [self setQueryParameter: nil forKey: @"userUIDString"];
 
-  prevMethod = [req formValueForKey:@"previousMethod"];
+  prevMethod = [self queryParameterForKey:@"previousMethod"];
   if(prevMethod == nil)
     prevMethod = @"";
 
@@ -460,6 +458,7 @@ static BOOL shouldDisplayWeekend = NO;
     [uri appendString:@"Groups/_custom_"];
     [uri appendString:uidsString];
     [uri appendString:@"/"];
+    NSLog (@"Group URI = '%@'", uri);
   }
   else {
       /* check if lastPathComponent is the base that we want to have */

UI/Scheduler/iCalPerson+UIx.h

@@ -28,6 +28,9 @@
 @class NSString;
 
 @interface iCalPerson(Convenience)
+
++ (iCalPerson *) personWithUid: (NSString *) uid;
+
 - (NSString *)cnForDisplay;
 @end
 

UI/Scheduler/iCalPerson+UIx.m

@@ -20,12 +20,32 @@
 */
 // $Id: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $
 
-#include "iCalPerson+UIx.h"
-#include "common.h"
+#import <SOGo/AgenorUserManager.h>
+#import "iCalPerson+UIx.h"
+#import "common.h"
 
-@implementation iCalPerson(Convenience)
+@implementation iCalPerson (Convenience)
 
-- (NSString *)cnForDisplay {
++ (iCalPerson *) personWithUid: (NSString *) uid
+{
+  iCalPerson *person;
+  AgenorUserManager *um;
+  NSString *email, *cn;
+
+  person = [self new];
+  [person autorelease];
+  
+  um = [AgenorUserManager sharedUserManager];
+  email = [um getEmailForUID: uid];
+  cn = [um getCNForUID: uid];
+  [person setCn: cn];
+  [person setEmail: email];
+
+  return person;
+}
+
+- (NSString *) cnForDisplay
+{
   return [self cnWithoutQuotes];
 }