From 47f01b79e5771e4e9b0634718845bd5e16502c59 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 19 Oct 2009 15:22:36 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: ccaab9322e172157de4d07dca19f1e071e7836a4
Monotone-Revision: 9a1a3fa3d7bc831a4d4d5e359f903fc187c31b04

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-19T15:22:36
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                         |  6 ++++++
 UI/Scheduler/UIxAppointmentEditor.m               | 10 ++++++++++
 UI/Templates/SchedulerUI/UIxAppointmentEditor.wox |  5 +++++
 3 files changed, 21 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 894b7f40c..ef507ef48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-19  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxAppointmentEditor.m
+	(-startDateIsEqualToEndDate): new method that returns whether or
+	not the start date is identical to the end date (used for all-day events).
+
 2009-10-19  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentObject.m
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index 94be99471..2346764ce 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -185,11 +185,21 @@
   return [dateFormatter formattedDateAndTime: aptStartDate];
 }
 
+- (NSString *) aptEndDateText
+{
+  return [dateFormatter formattedDate: aptEndDate];
+}
+
 - (NSString *) aptEndDateTimeText
 {
   return [dateFormatter formattedDateAndTime: aptEndDate];
 }
 
+- (BOOL) startDateIsEqualToEndDate
+{
+  return [aptStartDate isEqualToDate: aptEndDate];
+}
+
 /* actions */
 - (NSCalendarDate *) newStartDate
 {
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index c5a4dd3f3..483ceed31 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -59,6 +59,11 @@
   <label><var:string label:value="Start:" />
     <span class="content"><var:string var:value="aptStartDateText"/> (<var:string label:value="All day Event"/>)</span>
   </label>
+  <var:if condition="startDateIsEqualToEndDate" const:negate="YES">
+  <label><var:string label:value="End:" />
+    <span class="content"><var:string var:value="aptEndDateText" /></span>
+  </label>
+  </var:if>
   </var:if>
   <var:if condition="isAllDay" const:negate="YES">
   <label><var:string label:value="Start:" />