Explorar o código

Activity view last daysOfActivity (7) default

Marino Faggiana %!s(int64=8) %!d(string=hai) anos
pai
achega
2bb49f613c

+ 6 - 2
iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -15,6 +15,8 @@
 #define fontSizeAction  [UIFont systemFontOfSize:14]
 #define fontSizeNote    [UIFont systemFontOfSize:14]
 
+#define daysOfActivity  7
+
 @interface CCControlCenterActivity ()
 {
     BOOL _verbose;
@@ -85,10 +87,12 @@
         
         NSPredicate *predicate;
         
+        NSDate *sixDaysAgo = [[NSCalendar currentCalendar] dateByAddingUnit:NSCalendarUnitDay value:-daysOfActivity toDate:[NSDate date] options:0];
+        
         if ([CCUtility getActivityVerboseHigh])
-            predicate = [NSPredicate predicateWithFormat:@"((account == %@) || (account == ''))", app.activeAccount];
+            predicate = [NSPredicate predicateWithFormat:@"((account == %@) || (account == '')) AND (date > %@)", app.activeAccount, sixDaysAgo];
         else
-            predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (verbose == %lu)", app.activeAccount, k_activityVerboseDefault];
+            predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (verbose == %lu) AND (date > %@)", app.activeAccount, k_activityVerboseDefault, sixDaysAgo];
 
         _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate: predicate];