fixes for SOGo bug #1070

[scalable-opengroupware.org] / SOGo / UI / Scheduler / UIxCalMonthPrintview.m

diff --git a/SOGo/UI/Scheduler/UIxCalMonthPrintview.m b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
index 8e702d8c7e4ca62c87a71b5c6d05e383718d7f70..5dbd2644f7bbbde3312714d74da31afb62e7e88d 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
+++ b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
@@ -1,23 +1,23 @@
 /*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
+ Copyright (C) 2004 SKYRIX Software AG
+ 
+ This file is part of OpenGroupware.org.
+ 
+ OGo is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+ 
+ OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with OGo; see the file COPYING.  If not, write to the
+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ */
 // $Id$
 
 
@@ -34,49 +34,58 @@
 @implementation UIxCalMonthPrintview
 
 - (NSString *)shortTextForApt {
-    NSCalendarDate *startDate, *endDate;
-    NSMutableString *aptDescr;
-    NSString *s;
-    BOOL spansRange;
-    id apt;
-    
-    apt = [self appointment];
-    spansRange = NO;
-    startDate = [apt valueForKey:@"startDate"];
-    [startDate setTimeZone:[self viewTimeZone]];
-    endDate = [apt valueForKey:@"endDate"];
-    if(endDate != nil) {
-        [endDate setTimeZone:[self viewTimeZone]];
-        spansRange = ![endDate isEqualToDate:startDate];
-    }
-    aptDescr = [[NSMutableString alloc] init];
-    [aptDescr appendFormat:@"<span class=\"monthprintview_apt_time\">%02i:%02i",
-        [startDate hourOfDay],
-        [startDate minuteOfHour]];
-    if(spansRange) {
-        [aptDescr appendFormat:@" - %02i:%02i",
-            [endDate hourOfDay],
-            [endDate minuteOfHour]];
-    }
-    [aptDescr appendFormat:@"</span>,"];
-    s = [apt valueForKey:@"title"];
-    if(s) {
-        [aptDescr appendFormat:@"<br />%@", s];
-    }
-    s = [apt valueForKey:@"location"];
-    if(s) {
-        [aptDescr appendFormat:@"<br />%@", s];
-    }
-    return [aptDescr autorelease];
+  NSCalendarDate  *startDate, *endDate;
+  NSMutableString *aptDescr;
+  NSString        *s;
+  BOOL            isMyApt;
+  BOOL            spansRange;
+  id              apt;
+  
+  apt        = [self appointment];
+  isMyApt    = [self isMyApt];
+  spansRange = NO;
+  startDate  = [apt valueForKey:@"startDate"];
+  [startDate setTimeZone:[self viewTimeZone]];
+  endDate    = [apt valueForKey:@"endDate"];
+  if(endDate != nil) {
+    [endDate setTimeZone:[self viewTimeZone]];
+    spansRange = ![endDate isEqualToDate:startDate];
+  }
+
+  aptDescr = [[NSMutableString alloc] init];
+  [aptDescr appendFormat:@"<span class=\"%@\">%02i:%02i",
+                           isMyApt ? @"monthprintview_apt_time" :
+                                     @"monthprintview_apt_time_other",
+                           [startDate hourOfDay],
+                           [startDate minuteOfHour]];
+  if(spansRange) {
+    [aptDescr appendFormat:@" - %02i:%02i",
+                             [endDate hourOfDay],
+                             [endDate minuteOfHour]];
+  }
+  [aptDescr appendFormat:@"</span>,"];
+  if(!isMyApt)
+    [aptDescr appendFormat:@"<span class=\"%@\">", [self aptStyle]];
+  s = [apt valueForKey:@"title"];
+  if(s) {
+    [aptDescr appendFormat:@"<br />%@", s];
+  }
+  s = [apt valueForKey:@"location"];
+  if(s) {
+    [aptDescr appendFormat:@"<br />%@", s];
+  }
+  if(!isMyApt)
+    [aptDescr appendString:@"</span>"];
+  return [aptDescr autorelease];
 }
 
 - (NSString *)title {
-    NSCalendarDate *date;
-
-    date = [self startOfMonth];
-    return [NSString stringWithFormat:@"%@ %d",
-        [self localizedNameForMonthOfYear:[date monthOfYear]],
-        [date yearOfCommonEra]];
+  NSCalendarDate *date;
+  
+  date = [self startOfMonth];
+  return [NSString stringWithFormat:@"%@ %d",
+    [self localizedNameForMonthOfYear:[date monthOfYear]],
+    [date yearOfCommonEra]];
 }
 
 
@@ -84,9 +93,15 @@
 
 
 - (NSString *)contentStyle {
-    if([self->currentDay monthOfYear] != [[self startOfMonth] monthOfYear])
-        return @"monthprintview_content_dimmed";
-    return @"monthprintview_content";
+  if([self->currentDay monthOfYear] != [[self startOfMonth] monthOfYear])
+    return @"monthprintview_content_dimmed";
+  return @"monthprintview_content";
+}
+
+- (NSString *)aptStyle {
+  if (![self isMyApt])
+    return @"monthprintview_apt_other";
+  return nil;
 }
 
 @end