mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-13 15:57:12 +00:00
(fix) enhance display of all-day invitations (fixes #4145)
Conflicts: SoObjects/Appointments/SOGoAptMailNotification.m
This commit is contained in:
1 parent
0af81b0831
commit
d87dc6cdf2
5 files changed
+40
-15
No files matched your search
@@ -24,6 +24,8 @@
|
||||
#import <Foundation/NSTimeZone.h>
|
||||
|
||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGExtensions/NSCalendarDate+misc.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
#import <NGCards/iCalEvent.h>
|
||||
|
||||
@@ -182,6 +184,19 @@
|
||||
return sentByText;
|
||||
}
|
||||
|
||||
- (NSTimeInterval) duration
|
||||
{
|
||||
return [[self newEndDate] timeIntervalSinceDate:[self newStartDate]];
|
||||
}
|
||||
|
||||
- (BOOL) isEndDateOnSameDay
|
||||
{
|
||||
if ([[self apt] isAllDay])
|
||||
return ([self duration] <= 86400);
|
||||
|
||||
return [[self newStartDate] isDateOnSameDay: [self newEndDate]];
|
||||
}
|
||||
|
||||
- (NSString *) formattedAptStartDate
|
||||
{
|
||||
NSString *s;
|
||||
|
||||
Reference in new issue
Block a user