finished proposal's edit

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@266 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 5885bd304cbedd6587d6049f225ce163eb612589..7db31e9e377a099543596d264f998491d61e22af 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-25  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.69
+
+       * UIxAppointmentProposal.m: completed edit functionality. Resources and
+         participants are now passed as query parameters.
+       
+       * UIxAppointmentEditor.m: Resources and Participants are now properly
+         constructed from existing query parameters.
+
 2004-08-24  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.68

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index d06a662ee4d73706661f506bb29534831e80a205..f27a0fe453e8d76f160c32bdf890ba9f207d904b 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -53,6 +53,11 @@
 - (NSArray *)getICalPersonsFromFormValues:(NSArray *)_values
   treatAsResource:(BOOL)_isResource;
 
+- (NSString *)iCalParticipantsAndResourcesStringFromQueryParameters;
+- (NSString *)iCalParticipantsStringFromQueryParameters;
+- (NSString *)iCalResourcesStringFromQueryParameters;
+- (NSString *)iCalStringFromQueryParameter:(NSString *)_qp
+              format:(NSString *)_format;
 @end
 
 #include "common.h"
@@ -179,8 +184,10 @@
     @"DTEND:%@\n"
     @"TRANSP:OPAQUE\n"
     @"SEQUENCE:1\n"
+    @"%@"
     @"END:VEVENT\n"
     @"END:VCALENDAR";
+
   NSCalendarDate *lStartDate, *lEndDate;
   NSString       *template, *s;
   unsigned       minutes;
@@ -192,19 +199,71 @@
   else {
     minutes = 60;
   }
-  
   lStartDate = [self selectedDate];
   lEndDate   = [lStartDate dateByAddingYears:0 months:0 days:0
-                         hours:0 minutes:minutes seconds:0];
+                           hours:0 minutes:minutes seconds:0];
   
+  s = [self iCalParticipantsAndResourcesStringFromQueryParameters];
   template = [NSString stringWithFormat:iCalStringTemplate,
                         [[self clientObject] nameInContainer],
                         [[NSCalendarDate date] icalString],
                         [lStartDate icalString],
-                        [lEndDate   icalString]];
+             [lEndDate icalString],
+             s];
   return template;
 }
 
+- (NSString *)iCalParticipantsAndResourcesStringFromQueryParameters {
+  NSString *s;
+  
+  s = [self iCalParticipantsStringFromQueryParameters];
+  return [s stringByAppendingString:
+            [self iCalResourcesStringFromQueryParameters]];
+}
+
+- (NSString *)iCalParticipantsStringFromQueryParameters {
+  static NSString *iCalParticipantString = \
+    @"ATTENDEE;ROLE=REQ-PARTICIPANT;CN=\"%@\":mailto:%@\n";
+  
+  return [self iCalStringFromQueryParameter:@"ps"
+               format:iCalParticipantString];
+}
+
+- (NSString *)iCalResourcesStringFromQueryParameters {
+  static NSString *iCalResourceString = \
+    @"ATTENDEE;ROLE=NON-PARTICIPANT;CN=\"%@\":mailto:%@\n";
+
+  return [self iCalStringFromQueryParameter:@"rs"
+               format:iCalResourceString];
+}
+
+- (NSString *)iCalStringFromQueryParameter:(NSString *)_qp
+              format:(NSString *)_format
+{
+  AgenorUserManager *um;
+  NSMutableString *iCalRep;
+  NSString *s;
+
+  um = [AgenorUserManager sharedUserManager];
+  iCalRep = (NSMutableString *)[NSMutableString string];
+  s = [self queryParameterForKey:_qp];
+  if(s && [s length] > 0) {
+    NSArray *es;
+    unsigned i, count;
+    
+    es = [s componentsSeparatedByString:@","];
+    count = [es count];
+    for(i = 0; i < count; i++) {
+      NSString *email, *cn;
+      
+      email = [es objectAtIndex:i];
+      cn = [um getCNForUID:[um getUIDForEmail:email]];
+      [iCalRep appendFormat:_format, cn, email];
+    }
+  }
+  return iCalRep;
+}
+
 /* helper */
 
 - (NSString *)_completeURIForMethod:(NSString *)_method {

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.m b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
index 47bd022f5463377b72de1f6fdf0a0cf3c5b812ac..99858480481acc02eb613dcd1c4cfec78173ae36 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
@@ -50,10 +50,13 @@
 
 - (NSMutableDictionary *)currentQueryParameters;
 - (NSDictionary *)currentHourQueryParametersForFirstHalf:(BOOL)_first;
+
+- (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp;
 @end
 
 #include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include <NGExtensions/NGCalendarDateRange.h>
+#include "iCalPerson+UIx.h"
 #include "common.h"
 
 @implementation UIxAppointmentProposal
@@ -430,11 +433,28 @@
   if(!self->currentQueryParameters) {
     self->currentQueryParameters = [[self queryParameters] mutableCopy];
     [self->currentQueryParameters setObject:[self duration] forKey:@"dur"];
-    // TODO: add participants
+    [self setICalPersons:[self resources] asQueryParameter:@"rs"];
+    [self setICalPersons:[self participants] asQueryParameter:@"ps"];
   }
   return self->currentQueryParameters;
 }
 
+- (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp {
+  NSMutableString *s;
+  unsigned i, count;
+  
+  s = [[NSMutableString alloc] init];
+  count = [_ps count];
+  for(i = 0; i < count; i++) {
+    iCalPerson *p = [_ps objectAtIndex:i];
+    [s appendString:[p rfc822Email]];
+    if(i != (count - 1))
+      [s appendString:@","];
+  }
+  [[self currentQueryParameters] setObject:s forKey:_qp];
+  [s release];
+}
+
 - (NSDictionary *)currentHourQueryParametersForFirstHalf:(BOOL)_first {
   NSMutableDictionary *qp;
   NSString *hmString;

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index e5294622fd6fe57ed83cce2638611e44f47e3213..daa21696827167923d01d2affb2871a4720ec3b5 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=68
+SUBMINOR_VERSION:=69
 
 # v0.9.67 requires SOPE 4.3
 # v0.9.61 requires libNGExtensions v4.2.102