Change version number in last commit. Fixed a bug about the current d…

…ate in contribution graph.
hukun01 · Feb 12, 2014 · 3eeed35 · 3eeed35
1 parent 5d19d95
commit 3eeed35
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/Runner Stats/ViewController/RSStatsSecondVC.m b/Runner Stats/ViewController/RSStatsSecondVC.m
@@ -100,10 +100,23 @@ - (void)setupContributionGraphData
     df.dateFormat = @"yyyy-MM-dd HH:mm:ss";
     NSString *todayString = [df stringFromDate:[NSDate date]];
     NSCalendar *calendar = [NSCalendar currentCalendar];
+
+    NSInteger days = [calendar ordinalityOfUnit:NSDayCalendarUnit inUnit:NSMonthCalendarUnit forDate:[NSDate date]];
+    // if there is no record in recentRecords
+    if (0 == [recentRecords count]) {
+        for (int i=0; i<days-1; i++) {
+            [result addObject:@0];
+        }
+        [result addObject:@5];
+        self.contributionGraph.data = result;
+        return;
+    }
+
     NSInteger prevDays = 0;
-    NSInteger days = 0;
+    NSString *dateString1;
+
     for (NSArray *row in recentRecords) {
-        NSString *dateString1 = [row firstObject];
+        dateString1 = [row firstObject];
         if ([self date:dateString1 isInSameMonthWithDate:todayString]) {
             NSDate *recordDate = [df dateFromString:dateString1];
             days = [calendar ordinalityOfUnit:NSDayCalendarUnit inUnit:NSMonthCalendarUnit forDate:recordDate];
@@ -115,19 +128,12 @@ - (void)setupContributionGraphData
             prevDays = days;
         }
     }
-    // Change today's rect to green color
-    NSArray *lastRow = [recentRecords lastObject];
-    NSString *recordDateOfLastRow = [lastRow firstObject];
-    NSDate *lastDate = [df dateFromString:recordDateOfLastRow];
-    df.dateFormat = @"yyyy-MM-dd";
-    NSString *lastString = [df stringFromDate:lastDate];
-    todayString = [df stringFromDate:[NSDate date]];
-    if ([lastString isEqualToString:todayString]) {
-        [result replaceObjectAtIndex:[result count]-1 withObject:@5];
-    }
-    else {
-        [result addObject:@5];
+    NSInteger daysUntilNow = [calendar ordinalityOfUnit:NSDayCalendarUnit inUnit:NSMonthCalendarUnit forDate:[NSDate date]];
+    for (int i=0; i < daysUntilNow-days-1; ++i) {
+        [result addObject:@0];
     }
+    // Change today's rect to green color
+    [result addObject:@5];
 
     self.contributionGraph.data = result;
 }
@@ -148,9 +154,8 @@ - (NSArray *)readCurrentMonthRecord
     if (recordsNumber < 1) {
         return [NSArray array];
     }
-    NSDate *today = [NSDate date];
-    NSCalendar *calendar = [NSCalendar currentCalendar];
-    NSUInteger daysOfMonth = [calendar ordinalityOfUnit:NSDayCalendarUnit inUnit:NSMonthCalendarUnit forDate:today];
+
+    NSUInteger daysOfMonth = [[NSCalendar currentCalendar] ordinalityOfUnit:NSDayCalendarUnit inUnit:NSMonthCalendarUnit forDate:[NSDate date]];
     if (recordsNumber > daysOfMonth) {
         NSInteger location =  recordsNumber - daysOfMonth;
         NSInteger length = daysOfMonth;