From ff1944d09d68e5e2b38f6579f9c4c8fd07292c41 Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 18 Jun 2004 10:46:35 +0000
Subject: [PATCH] Fixed month navigation, some pretty printing

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@49 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 ZideStore/UI-X/ChangeLog                      | 17 +++++++
 ZideStore/UI-X/Common/OGoComponent.h          |  5 +-
 ZideStore/UI-X/Common/OGoComponent.m          | 12 +++++
 .../UI-X/Scheduler/OGoCalMonthOverview.wox    | 13 +++++-
 ZideStore/UI-X/Scheduler/OGoCalMonthView.h    |  4 ++
 ZideStore/UI-X/Scheduler/OGoCalMonthView.m    | 46 ++++++++-----------
 ZideStore/UI-X/Scheduler/OGoCalSelectTab.m    | 14 ------
 ZideStore/UI-X/Scheduler/OGoCalView.m         |  7 +++
 .../UI-X/Scheduler/OGoCalWeekOverview.wox     | 10 +++-
 ZideStore/UI-X/Scheduler/OGoCalWeekView.m     |  7 ---
 10 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog
index d3a8eec8..483f30a8 100644
--- a/ZideStore/UI-X/ChangeLog
+++ b/ZideStore/UI-X/ChangeLog
@@ -1,3 +1,20 @@
+2004-06-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* Common/OGoComponent.[hm]: new component which serves as a base
+	  component for calendar components now. Knows how to deal with
+	  queryParameters and offers url construction method(s).
+
+	* All existing components have been rewritten to use queryParameters
+	  instead of hardcoded strings where this is feasible. This provides
+	  future extensibility and flexibility.
+
+	* Handling of dates has been fixed to center around the use of a
+	  'day' parameter. startDate/endDate are coupled to this, but
+	  don't override it as it's the duty of the individual view to set
+	  its (feasible) ranges accordingly. The new behaviour is noticable
+	  in the calendar selection tabview instantly, as it now replicates
+	  what OGo does.
+
 2004-06-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* Common/OGoAppNavView.m: construct URL correctly.
diff --git a/ZideStore/UI-X/Common/OGoComponent.h b/ZideStore/UI-X/Common/OGoComponent.h
index 86795fdf..e5323457 100644
--- a/ZideStore/UI-X/Common/OGoComponent.h
+++ b/ZideStore/UI-X/Common/OGoComponent.h
@@ -35,9 +35,12 @@
 - (NSString *)queryParameterForKey:(NSString *)_key;
 - (NSDictionary *)queryParameters;
 
-/* use this to set permanent query parameters */
+/* use this to set 'sticky' query parameters */
 - (void)setQueryParameter:(NSString *)_param forKey:(NSString *)_key;
 
+/* appends queryParameters to _method if any are set */
+- (NSString *)completeHrefForMethod:(NSString *)_method;
+
 @end
 
 #endif	/* __OGoComponent_H_ */
diff --git a/ZideStore/UI-X/Common/OGoComponent.m b/ZideStore/UI-X/Common/OGoComponent.m
index e6b4e621..9e422ae6 100644
--- a/ZideStore/UI-X/Common/OGoComponent.m
+++ b/ZideStore/UI-X/Common/OGoComponent.m
@@ -108,4 +108,16 @@
     return self->queryParameters;
 }
 
+- (NSString *)completeHrefForMethod:(NSString *)_method {
+    NSDictionary *qp;
+    NSString *qs;
+    
+    qp = [self queryParameters];
+    if([qp count] == 0)
+        return _method;
+    
+    qs = [[self context] queryStringFromDictionary:qp];
+    return [_method stringByAppendingFormat:@"?%@", qs];
+}
+
 @end
diff --git a/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox b/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox
index ef612d31..b863898c 100644
--- a/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox
+++ b/ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox
@@ -27,7 +27,13 @@
         <tr bgcolor="#e8e8e0">
             <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
             <td align="right">
-                <var:component className="OGoCalBackForthNavView" prevURL="prevMonthURL" currentURL="thisMonthURL" nextURL="nextMonthURL" const:label="this month" />
+                <var:component className="OGoCalBackForthNavView"
+                               methodName="ownMethodName"
+                               prevQueryParameters="prevMonthQueryParameters"
+                               currentQueryParameters="todayQueryParameters"
+                               nextQueryParameters="nextMonthQueryParameters"
+                               const:label="this month"
+                />
             </td>
         </tr>
     </table>
@@ -39,7 +45,10 @@
   <table border="0" width="100%" cellpadding="0" cellspacing="0">
   <tr>
   <td colspan="2">
-  <var:component className="OGoCalSelectTab" const:selection="month" currentDate="startDate">
+  <var:component className="OGoCalSelectTab"
+                 const:selection="month"
+                 currentDate="selectedDate"
+  >
 
     <var:month-overview
       list="appointments"
diff --git a/ZideStore/UI-X/Scheduler/OGoCalMonthView.h b/ZideStore/UI-X/Scheduler/OGoCalMonthView.h
index a4ba3ac8..f2c79e58 100644
--- a/ZideStore/UI-X/Scheduler/OGoCalMonthView.h
+++ b/ZideStore/UI-X/Scheduler/OGoCalMonthView.h
@@ -15,6 +15,10 @@
 {
 }
 
+- (NSDictionary *)prevMonthQueryParameters;
+- (NSDictionary *)thisMonthQueryParameters;
+- (NSDictionary *)nextMonthQueryParameters;
+
 @end
 
 #endif /* __ZideStoreUI_OGoCalMonthView_H__ */
diff --git a/ZideStore/UI-X/Scheduler/OGoCalMonthView.m b/ZideStore/UI-X/Scheduler/OGoCalMonthView.m
index 3530b839..a0432716 100644
--- a/ZideStore/UI-X/Scheduler/OGoCalMonthView.m
+++ b/ZideStore/UI-X/Scheduler/OGoCalMonthView.m
@@ -19,35 +19,29 @@
 
 /* URLs (TODO: fix scroll ranges for months!) */
 
-- (NSString *)prevMonthURL {
-  NSCalendarDate *newMonthDate;
-
-  newMonthDate = [[[self startDate] firstDayOfMonth] dateByAddingYears:0
-                                                     months:-1
-                                                     days:0
-                                                     hours:0
-                                                     minutes:0
-                                                     seconds:0];
-  return [self dateNavigationURLWithNewStartDate:newMonthDate];
-}
-
-- (NSString *)nextMonthURL {
-  NSCalendarDate *newMonthDate;
 
-  newMonthDate = [[[self startDate] firstDayOfMonth] dateByAddingYears:0
-                                                     months:1
-                                                     days:0
-                                                     hours:0
-                                                     minutes:0
-                                                     seconds:0];
-    return [self dateNavigationURLWithNewStartDate:newMonthDate];
+- (NSDictionary *)prevMonthQueryParameters {
+    NSCalendarDate *date;
+    
+    date = [[[self startDate] firstDayOfMonth] dateByAddingYears:0
+                                               months:-1
+                                               days:0
+                                               hours:0
+                                               minutes:0
+                                               seconds:0];
+    return [self queryParametersBySettingSelectedDate:date];
 }
 
-- (NSString *)thisMonthURL {
-  NSCalendarDate *newMonthDate;
-  
-  newMonthDate = [[NSCalendarDate date] mondayOfWeek];
-  return [self dateNavigationURLWithNewStartDate:newMonthDate];
+- (NSDictionary *)nextMonthQueryParameters {
+    NSCalendarDate *date;
+    
+    date = [[[self startDate] firstDayOfMonth] dateByAddingYears:0
+                                               months:1
+                                               days:0
+                                               hours:0
+                                               minutes:0
+                                               seconds:0];
+    return [self queryParametersBySettingSelectedDate:date];
 }
 
 @end /* OGoCalMonthView */
diff --git a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m
index a2bcb9fc..07d26696 100644
--- a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m
+++ b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m
@@ -32,8 +32,6 @@
     NSCalendarDate *currentDate;
 }
 
-- (NSString *)completeHrefForMethod:(NSString *)_method;
-
 @end
 
 
@@ -85,18 +83,6 @@
 /* hrefs */
 
 
-- (NSString *)completeHrefForMethod:(NSString *)_method {
-    NSDictionary *qp;
-    NSString *qs;
-    
-    qp = [self queryParameters];
-    if([qp count] == 0)
-        return _method;
-
-    qs = [[self context] queryStringFromDictionary:qp];
-    return [_method stringByAppendingFormat:@"?%@", qs];
-}
-
 - (NSString *)daytabLink {
     return [self completeHrefForMethod:@"dayoverview"];
 }
diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.m b/ZideStore/UI-X/Scheduler/OGoCalView.m
index 1928ac0e..6fe2a058 100644
--- a/ZideStore/UI-X/Scheduler/OGoCalView.m
+++ b/ZideStore/UI-X/Scheduler/OGoCalView.m
@@ -162,6 +162,13 @@
 /* date selection & conversion */
 
 
+- (NSDictionary *)todayQueryParameters {
+    NSCalendarDate *date;
+    
+    date = [NSCalendarDate date]; /* today */
+    return [self queryParametersBySettingSelectedDate:date];
+}
+
 - (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date {
     NSMutableDictionary *qp;
     
diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
index e69e697f..b0add1c5 100644
--- a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
+++ b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
@@ -29,7 +29,13 @@
     <tr bgcolor="#e8e8e0">
     <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
     <td align="right">
-    <var:component className="OGoCalBackForthNavView" methodName="ownMethodName" prevQueryParameters="prevWeekQueryParameters" currentQueryParameters="thisWeekQueryParameters" nextQueryParameters="nextWeekQueryParameters" const:label="this week" />
+    <var:component className="OGoCalBackForthNavView"
+                   methodName="ownMethodName"
+                   prevQueryParameters="prevWeekQueryParameters"
+                   currentQueryParameters="todayQueryParameters"
+                   nextQueryParameters="nextWeekQueryParameters"
+                   const:label="this week"
+    />
     </td>
     </tr>
     </table>
@@ -96,8 +102,10 @@
   </td>
   </tr>
   </table>
+  <!--
   <hr />
   <var:string value="thisWeekQueryParameters" />
+  -->
   <!--
   <hr/>
     
diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekView.m b/ZideStore/UI-X/Scheduler/OGoCalWeekView.m
index c3ac9f6e..9a3fe080 100644
--- a/ZideStore/UI-X/Scheduler/OGoCalWeekView.m
+++ b/ZideStore/UI-X/Scheduler/OGoCalWeekView.m
@@ -24,13 +24,6 @@
     return [self queryParametersBySettingSelectedDate:date];
 }
 
-- (NSDictionary *)thisWeekQueryParameters {
-    NSCalendarDate *date;
-    
-    date = [NSCalendarDate date]; /* today */
-    return [self queryParametersBySettingSelectedDate:date];
-}
-
 - (NSDictionary *)nextWeekQueryParameters {
     NSCalendarDate *date;
     
-- 
2.39.5