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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index ded3c466589c93db47bbb06df7f581a684feab7c..bd3bece24fa3ba8b41164d8191d41c45f26d765e 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,12 @@
 2004-08-16  Helge Hess  <helge.hess@skyrix.com>
 
+       * v0.9.53
+
+       * UIxAppointmentProposal: added attendee selectors, added ivars, added
+         searchProposal action
+
+       * added green_corner.gif
+
        * iCalPerson+UIx.m: fixed -cnForDisplay to properly check for quotes
          prior removing them (v0.9.52)
 

diff --git a/SOGo/UI/Scheduler/GNUmakefile b/SOGo/UI/Scheduler/GNUmakefile
index 801c76be519029069d88a470a41e8e43cf42d05c..bfe324581f6baab96576226aebdcf571053f72c1 100644 (file)
--- a/SOGo/UI/Scheduler/GNUmakefile
+++ b/SOGo/UI/Scheduler/GNUmakefile
@@ -93,6 +93,7 @@ SchedulerUI_RESOURCE_FILES += \
        images/previous.gif                     \
        images/next.gif                         \
        images/last.gif                         \
+       images/green_corner.gif                 \
 
 SchedulerUI_LOCALIZED_RESOURCE_FILES += \
        default.strings                 \

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index ef83069e1c975ef329b26815cb8bebb9bac7a391..db7e548a8d93f9f4eb4967cf359cfea2bdb019a1 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -40,8 +40,8 @@
   NSString       *title;
   NSString       *location;
   NSString       *comment;
-  NSArray        *participants;
-  NSArray        *resources;
+  NSArray        *participants; /* array of iCalPerson's */
+  NSArray        *resources;    /* array of iCalPerson's */
 }
 
 - (NSString *)iCalStringTemplate;
@@ -423,7 +423,6 @@
     return self;
   }
   
-#warning TODO: implement proper "multi-saves"
   ex = [[self clientObject] saveContentString:content];
   if (ex != nil) {
     [self setErrorText:[ex reason]];

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.m b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
index 9e7c86acfa7d705efc248a0fabfdaacadf09a115..92ed59c893005f476ec0e1ce94213580a6197c35 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
@@ -26,6 +26,12 @@
 {
   id item;
   id currentDay;
+
+  /* individual values */
+  NSCalendarDate *startDate;
+  NSCalendarDate *endDate;
+  NSArray        *participants; /* array of iCalPerson's */
+  NSArray        *resources;    /* array of iCalPerson's */
 }
 
 @end
@@ -34,6 +40,14 @@
 
 @implementation UIxAppointmentProposal
 
+- (void)dealloc {
+  [self->startDate    release];
+  [self->endDate      release];
+  [self->participants release];
+  [self->resources    release];
+  [super dealloc];
+}
+
 /* notifications */
 
 - (void)sleep {
@@ -51,6 +65,32 @@
   return self->item;
 }
 
+- (void)setStartDate:(NSCalendarDate *)_date {
+  ASSIGN(self->startDate, _date);
+}
+- (NSCalendarDate *)startDate {
+  return self->startDate;
+}
+- (void)setEndDate:(NSCalendarDate *)_date {
+  ASSIGN(self->endDate, _date);
+}
+- (NSCalendarDate *)endDate {
+  return self->endDate;
+}
+
+- (void)setParticipants:(NSArray *)_parts {
+  ASSIGN(self->participants, _parts);
+}
+- (NSArray *)participants {
+  return self->participants;
+}
+- (void)setResources:(NSArray *)_res {
+  ASSIGN(self->resources, _res);
+}
+- (NSArray *)resources {
+  return self->resources;
+}
+
 - (void)setCurrentDay:(id)_day {
   ASSIGN(self->currentDay, _day);
 }
@@ -74,4 +114,18 @@
   return [NSArray arrayWithObjects:@"2004-08-15", nil];
 }
 
+/* actions */
+
+- (BOOL)shouldTakeValuesFromRequest:(WORequest *)_rq inContext:(WOContext*)_c{
+  return YES;
+}
+
+- (id)proposalSearchAction {
+  [self logWithFormat:@"search from %@ to %@", 
+         [self startDate], [self endDate]];
+  [self logWithFormat:@"  participants: %@", [self participants]];
+  [self logWithFormat:@"  resources:    %@", [self resources]];
+  return self;
+}
+
 @end /* UIxAppointmentProposal */

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
index f6e65561e3c7f241a29336f4029256ef2c46e8bf..323ca06359b682af7d78cc4a986767c8b732c5ea 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
@@ -2,15 +2,13 @@
 <var:component xmlns="http://www.w3.org/1999/xhtml"
                xmlns:var="http://www.skyrix.com/od/binding"
                xmlns:const="http://www.skyrix.com/od/constant"
+               xmlns:rsrc="OGo:url"
                xmlns:uix="OGo:uix"
                xmlns:label="OGo:label"
                className="UIxPageFrame"
                title="name"
 >
-  <table id="skywintable"
-         class="wintable"
-         cellspacing="0"
-         cellpadding="5"
+  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
          width="100%"
   >
     <tr>
@@ -39,7 +37,7 @@
                    label:label="Appointment proposal"
                    href="#"
           >
-            <form href="search">
+            <form href="proposalSearch">
               <table border="0" width="100%" cellspacing="0" cellpadding="4">
                 <tr bgcolor="#e8e8e0">
                   <td align="left" colspan="2">
@@ -68,7 +66,8 @@
                   </td>
                 </tr>
                 <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text" >
+                  <td align="right" width="15%" bgcolor="#E8E8E0" 
+                     class="aptview_text" >
                     <var:string label:value="End date" />:
                   </td>
                   <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
@@ -96,7 +95,8 @@
                   </td>
                 </tr>
                 <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text" >
+                  <td align="right" width="15%" bgcolor="#E8E8E0" 
+                     class="aptview_text" >
                     <var:string label:value="Latest end time" />:
                   </td>
                   <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
@@ -108,7 +108,8 @@
                   </td>
                 </tr>
                 <tr valign="top">
-                  <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text" >
+                  <td align="right" width="15%" bgcolor="#E8E8E0" 
+                     class="aptview_text" >
                     <var:string label:value="Duration" />:
                   </td>
                   <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
@@ -133,7 +134,14 @@
                     </span>
                   </td>
                   <td align="left" bgcolor="#FFFFF0">
-                    Anais resource selector
+                    <span class="aptview_text">
+                      <var:component className="AnaisAttendeeSelector"
+                        const:selectorID="resource"
+                        const:role="NON-PARTICIPANT"
+                        attendees="resources"
+                        const:division="CC"
+                      />
+                    </span>
                   </td>
                 </tr>
                 <tr><td colspan="2"> </td></tr>
@@ -154,7 +162,17 @@
                     </span>
                   </td>
                   <td align="left" bgcolor="#FFFFF0">
-                    Anais person selector
+                    <span class="aptview_text">
+                      <var:component className="AnaisAttendeeSelector"
+                        const:selectorID="participant"
+                        const:division="CC"
+                        const:withCN="YES"
+                        const:role="REQ-PARTICIPANT"
+                        attendees="participants"
+                        var:emailForUser="emailForUser"
+                        var:cnForUser="cnForUser"
+                      />
+                    </span>
                   </td>
                 </tr>
                 <tr><td colspan="2"> </td></tr>
@@ -164,7 +182,7 @@
                   <td>
                     <input type="submit"
                            label:value="Search"
-                           name="search:method"
+                           name="proposalSearch:method"
                     />
                     <span class="button_auto_env"
                       ><a href=".." class="button_auto"
@@ -209,7 +227,8 @@
                   </td>
                   <var:foreach list="hours" item="item">
                     <td align="left" bgcolor="#FAE8B8" valign="top">
-                      <a href="#"><img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" alt="new" border="0" /></a>
+                      <a href="#"><img rsrc:src="green_corner.gif" alt="new" 
+                                       border="0" /></a>
                     </td>
                     <td align="middle" bgcolor="#FFAAAA" valign="middle"> </td>
                   </var:foreach>

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 0a10d2c5806da406b7017b35e91f91184e13af3f..f8d8760cfdcb842a76552a6b56a12a36046fa601 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=52
+SUBMINOR_VERSION:=53
 
 # v0.9.41 requires libNGObjWeb     v4.2.431
 # v0.9.31 requires libWEExtensions v4.2.52

diff --git a/SOGo/UI/Scheduler/images/green_corner.gif b/SOGo/UI/Scheduler/images/green_corner.gif
new file mode 100644 (file)
index 0000000..6a06d05
Binary files /dev/null and b/SOGo/UI/Scheduler/images/green_corner.gif differ

diff --git a/SOGo/UI/Scheduler/product.plist b/SOGo/UI/Scheduler/product.plist
index 58d326c2505f97859a0301c03a6cf520098973b1..8305b19828ae9399b86f85859a1bb5e8becae6e2 100644 (file)
--- a/SOGo/UI/Scheduler/product.plist
+++ b/SOGo/UI/Scheduler/product.plist
@@ -18,7 +18,8 @@
     next.gif,
     last.gif,
     skycalendar.html,
-    skycalendar.js
+    skycalendar.js,
+    green_corner.gif,
   );
 
   factories = {
@@ -89,6 +90,11 @@
           protectedBy = "View";
           pageName    = "UIxAppointmentProposal"; 
         };
+        proposalSearch = { 
+          protectedBy = "View";
+          pageName    = "UIxAppointmentProposal"; 
+          actionName  = "proposalSearch";
+        };
       };
     };