From ab54a79f4e5420b03a95abe7cda8f9f27b0ca641 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 22 Aug 2006 19:20:42 +0000
Subject: [PATCH] Monotone-Parent: d18f0aa2897e1a434d29ff1a25c25618cf9dfdee
 Monotone-Revision: cde93a16020f7bfc02a031b4171164e4eba56d44

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-22T19:20:42
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                        |  7 +++
 UI/Scheduler/UIxCalAptListView.m | 92 +++++++++++++++-----------------
 2 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e60d17b4..a154a2e25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-08-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxCalAptListView.m ([UIxCalAptListView -startDate]) 
+	([UIxCalAptListView -endDate]): "today" is now the default filter
+	for displayed events.
+	([UIxCalAptListView -currentSerialDay]): new method returning the
+	date of the current enumerated appointment in serial form
+	(yyyymmdd).
+
 	* UI/WebServerResources/SchedulerUI.js: added code to select the
 	relevant day when an appointment is selected. Added code to popup
 	a month and a year menu whenever the header entries are clicked in
diff --git a/UI/Scheduler/UIxCalAptListView.m b/UI/Scheduler/UIxCalAptListView.m
index 58a09a23b..d75bcc842 100644
--- a/UI/Scheduler/UIxCalAptListView.m
+++ b/UI/Scheduler/UIxCalAptListView.m
@@ -54,39 +54,25 @@
   return currentAppointment;
 }
 
-//     @"view_all", nil,
-//     @"view_today",  @"flags = 'seen'   AND NOT (flags = 'deleted')",
-//     @"view_next7",  @"flags = 'unseen' AND NOT (flags = 'deleted')",
-//     @"view_next14", @"flags = 'deleted'",
-//     @"view_next31", @"flags = 'flagged'",
-//     @"view_thismonth", @"flags = 'flagged'",
-//     @"view_future", @"flags = 'flagged'",
-//     @"view_selectedday", @"flags = 'flagged'",
-
-// - (NSCalendarDate *)firstDayOfMonth;
-// - (NSCalendarDate *)lastDayOfMonth;
-
 - (NSCalendarDate *) startDate
 {
+  NSCalendarDate *today;
   NSString *filterPopup;
 
   if (!startDate)
     {
       filterPopup = [self queryParameterForKey: @"filterpopup"];
-      if (filterPopup
-          && [filterPopup length] > 0
-          && ![filterPopup isEqualToString: @"view_all"])
-        {
-          if ([filterPopup isEqualToString: @"view_thismonth"])
-            startDate = [[NSCalendarDate date] firstDayOfMonth];
-          else if ([filterPopup isEqualToString: @"view_selectedday"])
-            startDate = [self selectedDate];
-          else
-            startDate = [NSCalendarDate date];
-          startDate = [startDate beginOfDay];
-        }
-      else
+      today = [[NSCalendarDate date] beginOfDay];
+      if (!filterPopup || ![filterPopup length])
+        startDate = today;
+      else if ([filterPopup isEqualToString: @"view_selectedday"])
+        startDate = [[self selectedDate] beginOfDay];
+      else if ([filterPopup isEqualToString: @"view_thismonth"])
+        startDate = [today firstDayOfMonth];
+      else if ([filterPopup isEqualToString: @"view_all"])
         startDate = [NSCalendarDate dateWithTimeIntervalSince1970: 0];
+      else
+        startDate = today;
     }
 
   return startDate;
@@ -100,32 +86,26 @@
   if (!endDate)
     {
       filterPopup = [self queryParameterForKey: @"filterpopup"];
-      if (filterPopup
-          && [filterPopup length] > 0
-          && ![filterPopup isEqualToString: @"view_all"]
-          && ![filterPopup isEqualToString: @"view_future"])
-        {
-          if ([filterPopup isEqualToString: @"view_thismonth"])
-            endDate = [[NSCalendarDate date] lastDayOfMonth];
-          else if ([filterPopup isEqualToString: @"view_selectedday"])
-            endDate = [self selectedDate];
-          else
-            {
-              today = [NSCalendarDate date];
-              if ([filterPopup isEqualToString: @"view_today"])
-                endDate = today;
-              else if ([filterPopup isEqualToString: @"view_next7"])
-                endDate = [today dateByAddingYears: 0 months: 0 days: 7];
-              else if ([filterPopup isEqualToString: @"view_next14"])
-                endDate = [today dateByAddingYears: 0 months: 0 days: 14];
-              else if ([filterPopup isEqualToString: @"view_next31"])
-                endDate = [today dateByAddingYears: 0 months: 1 days: 0];
-            }
 
-          endDate = [endDate endOfDay];
-        }
-      else
+      today = [[NSCalendarDate date] endOfDay];
+      if (!filterPopup || ![filterPopup length]
+          || [filterPopup isEqualToString: @"view_today"])
+        endDate = today;
+      else if ([filterPopup isEqualToString: @"view_all"]
+               || [filterPopup isEqualToString: @"view_future"])
         endDate = [NSCalendarDate dateWithTimeIntervalSince1970: 0x7fffffff];
+      else if ([filterPopup isEqualToString: @"view_thismonth"])
+        endDate = [today lastDayOfMonth];
+      else if ([filterPopup isEqualToString: @"view_selectedday"])
+        endDate = [[self selectedDate] endOfDay];
+      else if ([filterPopup isEqualToString: @"view_next7"])
+        endDate = [today dateByAddingYears: 0 months: 0 days: 7];
+      else if ([filterPopup isEqualToString: @"view_next14"])
+        endDate = [today dateByAddingYears: 0 months: 0 days: 14];
+      else if ([filterPopup isEqualToString: @"view_next31"])
+        endDate = [today dateByAddingYears: 0 months: 1 days: 0];
+      else
+        endDate = today;
     }
 
   return endDate;
@@ -184,4 +164,18 @@
   return [currentAppointment objectForKey: @"location"];
 }
 
+- (NSString *) currentSerialDay
+{
+  NSCalendarDate *date;
+  int intDate;
+
+  intDate = [[currentAppointment objectForKey: @"startdate"] intValue];
+  date = [NSCalendarDate dateWithTimeIntervalSince1970: intDate];
+
+  return [NSString stringWithFormat: @"%d%.2d%.2d",
+                   [date yearOfCommonEra],
+                   [date monthOfYear],
+                   [date dayOfMonth]];
+}
+
 @end