From 36cd17da6382bc502eb781a1464c36e331e6a299 Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 21 Dec 2004 17:54:31 +0000
Subject: [PATCH] changes to UIxCalScheduleOverview

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@482 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/UI/Scheduler/ChangeLog                   |  9 +++++
 .../Scheduler/English.lproj/default.strings   |  2 +-
 SOGo/UI/Scheduler/UIxCalScheduleOverview.m    | 36 +++++++++++--------
 SOGo/UI/Scheduler/UIxCalScheduleOverview.wox  | 31 ++++++++++++----
 SOGo/UI/Scheduler/Version                     |  3 +-
 5 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 3ad8a30f..47c3242a 100644
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,14 @@
 2004-12-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+	* v0.9.107
+
+	* UIxCalScheduleOverview.wox: only display appropriate buttons for
+	  actions to take
+	
+	* UIxCalScheduleOverview.m: cache userParticipationStatus result
+
+	* English.lproj/default.strings: changed "action" label
+
 	* v0.9.106
 
 	* UIxCalScheduleOverview.wox: different visual representation for
diff --git a/SOGo/UI/Scheduler/English.lproj/default.strings b/SOGo/UI/Scheduler/English.lproj/default.strings
index f1c14fdc..910eebed 100644
--- a/SOGo/UI/Scheduler/English.lproj/default.strings
+++ b/SOGo/UI/Scheduler/English.lproj/default.strings
@@ -93,7 +93,7 @@
 "Meetings proposed by you" = "Meetings proposed by you";
 "Meetings proposed to you" = "Meetings proposed to you";
 "sched_startDateFormat" = "%d.%m. %H:%M";
-"action"		= "Actions";
+"action"		= "Your Status";
 "accept"		= "Accept";
 "decline"		= "Decline";
 "more participants"     = "more participants";
diff --git a/SOGo/UI/Scheduler/UIxCalScheduleOverview.m b/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
index 86396ede..e0c3127f 100644
--- a/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
+++ b/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
@@ -30,6 +30,7 @@
   id             item;
   NSArray        *partNames;
   NSArray        *partStates;
+  NSString       *userParticipationStatus;
   unsigned       participantIndex;
 }
 
@@ -63,11 +64,12 @@
 @implementation UIxCalScheduleOverview
 
 - (void)dealloc {
-  [self->userApts    release];
-  [self->foreignApts release];
-  [self->partNames   release];
-  [self->partStates  release];
-  [self->item        release];
+  [self->userApts                release];
+  [self->foreignApts             release];
+  [self->item                    release];
+  [self->partNames               release];
+  [self->partStates              release];
+  [self->userParticipationStatus release];
   [super dealloc];
 }
 
@@ -153,16 +155,20 @@
 }
 
 - (NSString *)userParticipationStatus {
-  NSString *pms;
-  NSArray  *partmails;
-  unsigned idx;
-
-  pms       = [self->item valueForKey:@"partmails"];
-  partmails = [pms componentsSeparatedByString:@"\n"];
-  idx       = [partmails indexOfObject:[self emailForUser]];
-  if (idx == NSNotFound)
-    return @"";
-  return [self->partStates objectAtIndex:idx];
+  if (!self->userParticipationStatus) {
+    NSString *pms;
+    NSArray  *partmails;
+    unsigned idx;
+    
+    pms       = [self->item valueForKey:@"partmails"];
+    partmails = [pms componentsSeparatedByString:@"\n"];
+    idx       = [partmails indexOfObject:[self emailForUser]];
+    if (idx == NSNotFound)
+      self->userParticipationStatus = @"";
+    self->userParticipationStatus =
+      [[self->partStates objectAtIndex:idx] retain];
+  }
+  return userParticipationStatus;
 }
 
 
diff --git a/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox b/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox
index a7530b3f..e28ab2bd 100644
--- a/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox
@@ -180,15 +180,32 @@
                                 />
                               </td>
                               <var:if condition="isFirstParticipant">
-                                <td class="button_submit_env"
+                                <td class="schedoverview"
                                     var:rowspan="rowspan"
                                 >
-                                  <a var:href="acceptAppointmentURL"
-                                     class="button_auto"
-                                  ><var:string label:value="accept" /></a>
-                                  <a var:href="declineAppointmentURL"
-                                     class="button_auto"
-                                  ><var:string label:value="decline" /></a>
+                                  <p class="schedoverview">
+                                    <var:component className="UIxCalParticipationStatusView"
+                                                   partStat="userParticipationStatus"
+                                    />
+                                  </p>
+                                  
+                                    <var:if-key const:key="userParticipationStatus"
+                                                const:value="1"
+                                                const:negate="YES"
+                                    >  
+                                      <a var:href="acceptAppointmentURL"
+                                         class="button_auto"
+                                      ><var:string label:value="accept" /></a>
+                                    </var:if-key>
+                                    <var:if-key const:key="userParticipationStatus"
+                                                const:value="2"
+                                                const:negate="YES"
+                                    >  
+                                      <a var:href="declineAppointmentURL"
+                                         class="button_auto"
+                                      ><var:string label:value="decline" /></a>
+                                    </var:if-key>
+                                  
                                 </td>
                               </var:if>
                             </tr>
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index af6dc912..3d3bba2d 100644
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,7 +1,8 @@
 # $Id$
 
-SUBMINOR_VERSION:=106
+SUBMINOR_VERSION:=107
 
+# v0.9.107 requires WOExtensions v4.5.21
 # v0.9.105 requires NGObjWeb     v4.5.102
 # v0.9.101 requires NGiCal       v4.5.36
 # v0.9.100 requires SOGoUI       v0.9.21
-- 
2.39.5