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
This commit is contained in:
Francis Lachapelle
2009-10-19 15:22:36 +00:00
parent f0e37a8885
commit 47f01b79e5
3 changed files with 21 additions and 0 deletions

View File

@@ -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

View File

@@ -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
{

View File

@@ -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:" />