From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Sun, 15 Aug 2004 18:03:22 +0000 (+0000)
Subject: attendee selector
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a79497fc157cf5be9a7d41ac83da65541824509;p=scalable-opengroupware.org

attendee selector


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

diff --git a/SOGo/UI/Anais/AnaisAttendeeSelector.m b/SOGo/UI/Anais/AnaisAttendeeSelector.m
index 7bcc8a74..cfcc02c9 100644
--- a/SOGo/UI/Anais/AnaisAttendeeSelector.m
+++ b/SOGo/UI/Anais/AnaisAttendeeSelector.m
@@ -28,8 +28,12 @@
   Select a set of attendees using Anais.
   
   Bindings:
-    attendees  - array of iCalPerson objects
-    selectorID - string to be used as the identifier for form/JS elements
+    attendees    - array of iCalPerson objects
+    selectorID   - string to be used as the identifier for form/JS elements
+    withCN       - show CN of person (eg disabled for resources)
+    division     - Anais division
+    emailForUser - default EMail
+    cnForUser    - default CN
 
   Sample:
     <var:component className="AnaisAttendeeSelector"
@@ -47,21 +51,30 @@
   NSString   *division;
   NSArray    *attendees;
   iCalPerson *attendee;
+  NSString   *emailForUser;
+  NSString   *cnForUser;
+  struct {
+    int withCN:1;
+    int reserved:31;
+  } flags;
 }
 
 @end
 
 #include <NGiCal/NGiCal.h>
+#include <Scheduler/iCalPerson+UIx.h>
 #include <NGObjWeb/WOContext.h>
 #include "common.h"
 
 @implementation AnaisAttendeeSelector
 
 - (void)dealloc {
-  [self->division   release];
-  [self->selectorID release];
-  [self->attendee   release];
-  [self->attendees  release];
+  [self->emailForUser release];
+  [self->cnForUser    release];
+  [self->division     release];
+  [self->selectorID   release];
+  [self->attendee     release];
+  [self->attendees    release];
   [super dealloc];
 }
 
@@ -80,6 +93,19 @@
 - (NSArray *)attendees {
   return self->attendees;
 }
+- (BOOL)hasAttendees {
+  return [[self attendees] count] > 0 ? YES : NO;
+}
+- (BOOL)hasNoAttendees {
+  return [[self attendees] count] == 0 ? YES : NO;
+}
+
+- (void)setWithCN:(BOOL)_flag {
+  self->flags.withCN = _flag ? 1 : 0;
+}
+- (BOOL)withCN {
+  return self->flags.withCN ? YES : NO;
+}
 
 - (void)setAttendee:(iCalPerson *)_attendee {
   ASSIGN(self->attendee, _attendee);
@@ -95,6 +121,42 @@
   return self->division;
 }
 
+- (void)setEmailForUser:(NSString *)_value {
+  ASSIGNCOPY(self->emailForUser, _value);
+}
+- (NSString *)emailForUser {
+  return self->emailForUser;
+}
+
+- (void)setCnForUser:(NSString *)_value {
+  ASSIGNCOPY(self->cnForUser, _value);
+}
+- (NSString *)cnForUser {
+  return self->cnForUser;
+}
+
+- (BOOL)showDefaultAttendees {
+  return [self hasNoAttendees] && [[self emailForUser] length] > 0 ? YES : NO;
+}
+
+/* email, cn */
+
+- (NSString *)combinedCNAndEmailForUser {
+  NSString *e, *c;
+
+  e = [self emailForUser];
+  c = [self cnForUser];
+  return [[e stringByAppendingString:@";"] stringByAppendingString:c];
+}
+
+- (NSString *)combinedCNAndEmail {
+  NSString *e, *c;
+  
+  e = [[self attendee] rfc822Email];
+  c = [[self attendee] cnForDisplay];
+  return [[e stringByAppendingString:@";"] stringByAppendingString:c];
+}
+
 /* id accessors */
 
 - (void)setSelectorID:(NSString *)_value {
diff --git a/SOGo/UI/Anais/AnaisAttendeeSelector.wox b/SOGo/UI/Anais/AnaisAttendeeSelector.wox
index 76e9b6c5..471a88e2 100644
--- a/SOGo/UI/Anais/AnaisAttendeeSelector.wox
+++ b/SOGo/UI/Anais/AnaisAttendeeSelector.wox
@@ -16,14 +16,38 @@
                  var:callback="callbackName" />
   <hr />
   <table var:id="tableId">
-    <var:foreach list="attendees" item="attendee">
+    <var:if condition="showDefaultAttendees">
       <tr>
         <td><input type="checkbox"
                    checked="YES"
-                   var:value="attendee.rfc822Email"
-                   var:id="attendee.rfc822Email"
+                   var:value="combinedCNAndEmailForUser"
+                   var:id="emailForUser"
                    var:name="checkboxId"
-            /></td>
+             /></td>
+        <td><var:string value="cnForUser" /></td>
+      </tr>
+    </var:if>
+
+    <var:foreach list="attendees" item="attendee">
+      <tr>
+        <var:if condition="withCN">
+          <td><input type="checkbox"
+                     checked="YES"
+                     var:value="combinedCNAndEmail"
+                     var:id="attendee.rfc822Email"
+                     var:name="checkboxId"
+              /></td>
+        </var:if>
+
+        <var:if condition="withCN" const:negate="YES">
+          <td><input type="checkbox"
+                     checked="YES"
+                     var:value="attendee.rfc822Email"
+                     var:id="attendee.rfc822Email"
+                     var:name="checkboxId"
+              /></td>
+        </var:if>
+
         <td><var:string value="attendee.cnForDisplay" /></td>
       </tr>
     </var:foreach>
diff --git a/SOGo/UI/Anais/ChangeLog b/SOGo/UI/Anais/ChangeLog
index 29eeed14..37b72578 100644
--- a/SOGo/UI/Anais/ChangeLog
+++ b/SOGo/UI/Anais/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-15  Helge Hess  <helge.hess@skyrix.com>
 
+	* AnaisAttendeeSelector.m: added support for default attendees (as used
+	  by the editor component) (v0.9.6)
+
 	* AnaisAttendeeSelector.wox: added 'division' binding (v0.9.5)
 
 	* added AnaisAttendeeSelector component (v0.9.4)
diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index a03d2f80..31a32af2 100644
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-15  Helge Hess  <helge.hess@skyrix.com>
+
+	* v0.9.44
+
+	* UIxAppointmentEditor.m: use new AnaisAttendeeSelector
+
+	* UIxAppointmentEditor.m: replaced formattedAptStartDate with a
+	  titleDateFormatter (directly bound to the string element)
+
 2004-08-15  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* v0.9.43
diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index 53a6fbcb..93081f2f 100644
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -89,34 +89,28 @@
   return self->item;
 }
 
-- (NSString *)formattedAptStartTime {
-  NSCalendarDate    *date;
+- (NSFormatter *)titleDateFormatter {
   SOGoDateFormatter *fmt;
-  NSString *s;
-
-  date = [[[[self appointment] startDate] copy] autorelease];
-  [date setTimeZone:[self viewTimeZone]];
-  fmt = [[SOGoDateFormatter alloc] initWithLocale:[self locale]];
+  
+  fmt = [[[SOGoDateFormatter alloc] initWithLocale:[self locale]] autorelease];
   [fmt setFullWeekdayNameAndDetails];
-  s = [fmt stringForObjectValue:date];
-  [fmt release];
-  return s;
+  return fmt;
 }
 
 - (NSCalendarDate *)aptStartDate {
-    NSCalendarDate *date;
-
-    date = [[[[self appointment] startDate] copy] autorelease];
-    [date setTimeZone:[self viewTimeZone]];
-    return date;
+  NSCalendarDate *date;
+    
+  date = [[[[self appointment] startDate] copy] autorelease];
+  [date setTimeZone:[self viewTimeZone]];
+  return date;
 }
 
 - (NSCalendarDate *)aptEndDate {
-    NSCalendarDate *date;
+  NSCalendarDate *date;
     
-    date = [[[[self appointment] endDate] copy] autorelease];
-    [date setTimeZone:[self viewTimeZone]];
-    return date;
+  date = [[[[self appointment] endDate] copy] autorelease];
+  [date setTimeZone:[self viewTimeZone]];
+  return date;
 }
 
 - (BOOL)isNewAppointment {
@@ -239,7 +233,7 @@
   return [self completeHrefForMethod:uri];
 }
 
-/* email, cn */
+/* email, cn TODO: unused now?*/
 
 - (NSString *)combinedCNAndEmailForUser {
   return [NSString stringWithFormat:@"%@;%@",
diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
index 46ab1be0..ed544bac 100644
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
@@ -25,17 +25,15 @@
       </tr>
       <tr>
         <td>
-          <table border="0"
-                 cellpadding="2"
-                 width="100%"
-                 cellspacing="0"
+          <table border="0" cellpadding="2" cellspacing="0" width="100%"
                  bgcolor="#e8e8e0"
           >
             <tr>
               <td align="left" colspan="2">
                 <span class="aptview_title">
                   <var:string label:value="Appointment on" /> 
-                  <var:string value="formattedAptStartTime" /></span>
+                  <var:string formatter="titleDateFormatter" 
+                              value="aptStartDate" /></span>
               </td>
             </tr>
             <tr valign="top">
@@ -87,11 +85,8 @@
               </td>
               <td align="left" bgcolor="#FFFFF0">
                 <span class="aptview_text">
-                  <input type="text"
-                         name="summary"
-                         var:value="appointment.summary"
-                         const:size="40"
-                  />
+                  <input type="text" name="summary" const:size="40"
+                         var:value="appointment.summary" />
                 </span>
               </td>
             </tr>
@@ -103,11 +98,8 @@
               </td>
               <td align="left" bgcolor="#FFFFF0">
                 <span class="aptview_text">
-                  <input type="text"
-                         name="location"
-                         var:value="appointment.location"
-                         const:size="40"
-                  />
+                  <input type="text" name="location" const:size="40"
+                         var:value="appointment.location" />
                 </span>
               </td>
             </tr>
@@ -132,48 +124,15 @@
                   <var:string label:value="Participants" />:</span>
               </td>
               <td align="left" bgcolor="#FFFFF0">
-                <script language="JavaScript">
-                 <var:string value="jsCode" const:escapeHTML="NO" />
-                </script>
-               
                 <span class="aptview_text">
-                  <var:component className="AnaisSelector"
-                                 label:title="Search in Anais"
-                                 const:windowId="Participants"
-                                 const:callback="addParticipant"
-                                 const:division="CC"
+                  <var:component className="AnaisAttendeeSelector"
+                    const:selectorID="participant"
+                    const:division="CC"
+                    const:withCN="YES"
+                    attendees="appointment.participants"
+                    var:emailForUser="emailForUser"
+                    var:cnForUser="cnForUser"
                   />
-                  <hr />
-                  <table id="participants">
-                    <var:if condition="appointment.hasParticipants"
-                            const:negate="YES"
-                    >
-                      <tr>
-                        <td><input type="checkbox"
-                                   checked="YES"
-                                   var:value="combinedCNAndEmailForUser"
-                                   var:id="emailForUser"
-                                   name="participants"
-                            /></td>
-                        <td><var:string value="cnForUser" /></td>
-                      </tr>
-                    </var:if>
-                    <var:if condition="appointment.hasParticipants">
-                      <var:foreach list="appointment.participants"
-                                   item="item"
-                      >
-                        <tr>
-                          <td><input type="checkbox"
-                                     checked="YES"
-                                     var:value="combinedCNAndEmail"
-                                     var:id="item.rfc822Email"
-                                     name="participants"
-                              /></td>
-                          <td><var:string value="item.cnForDisplay" /></td>
-                        </tr>
-                      </var:foreach>
-                    </var:if>
-                  </table>
                 </span>
               </td>
             </tr>
@@ -182,10 +141,7 @@
       </tr>
       <tr>
         <td>
-          <table border="0"
-                 cellpadding="2"
-                 width="100%"
-                 cellspacing="0"
+          <table border="0" cellpadding="2" cellspacing="0" width="100%"
                  bgcolor="#e8e8e0"
           >
             <tr>
@@ -203,27 +159,11 @@
               </td>
               <td align="left" bgcolor="#FFFFF0">
                 <span class="aptview_text">
-                  <var:component className="AnaisSelector"
-                                 label:title="Search in Anais"
-                                 const:windowId="Resources"
-                                 const:callback="addResource"
+                  <var:component className="AnaisAttendeeSelector"
+                    const:selectorID="resource"
+                    attendees="appointment.resources"
+                    const:division="CC"
                   />
-                  <hr />
-                  <table id="resources">
-                    <var:foreach list="appointment.resources"
-                                 item="item"
-                    >
-                      <tr>
-                        <td><input type="checkbox"
-                                   checked="YES"
-                                   var:value="item.rfc822Email"
-                                   var:id="item.rfc822Email"
-                                   name="resources"
-                            /></td>
-                        <td><var:string value="item.cnForDisplay" /></td>
-                      </tr>
-                    </var:foreach>
-                  </table>
                 </span>
               </td>
             </tr>
@@ -232,10 +172,7 @@
       </tr>
       <tr>
         <td>
-          <table border="0"
-                 cellpadding="2"
-                 width="100%"
-                 cellspacing="0"
+          <table border="0" cellpadding="2" cellspacing="0" width="100%"
                  bgcolor="#e8e8e0"
           >
             <tr>
@@ -253,11 +190,8 @@
               </td>
               <td align="left" bgcolor="#FFFFF0">
                 <span class="aptview_text">
-                  <textarea name="comment"
-                            rows="8"
-                            cols="80"
-                            wrap="physical"
-                  ><var:string value="appointment.comment" /></textarea>
+                  <textarea name="comment" rows="8" cols="80" wrap="physical"
+                            var:value="appointment.comment" />
                 </span>
               </td>
             </tr>
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 08df903e..24305041 100644
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=43
+SUBMINOR_VERSION:=44
 
 # v0.9.41 requires libNGObjWeb     v4.2.431
 # v0.9.31 requires libWEExtensions v4.2.52