Merge pull request #23 from eclopez/emergency-bugfix

Emergency bugfix

Author: eclopez

SteamGenius/SGBattleDetailViewController.m

@@ -159,7 +159,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                     }
                     break;
                 case 2:
-                    cell.textLabel.text = self.battle.controlPoints ? [NSString stringWithFormat:@"%@ control points", [self.battle.killPoints stringValue]] : @"No control points entered";
+                    cell.textLabel.text = self.battle.controlPoints ? [NSString stringWithFormat:@"%@ control points", [self.battle.controlPoints stringValue]] : @"No control points entered";
                     if (!self.battle.controlPoints) {
                         isEmptyData = YES;
                     }

SteamGenius/SGBattleFormViewController.m

@@ -75,7 +75,7 @@ - (IBAction)saveBattle:(id)sender {
             self.battle.event = form.event;
             self.battle.notes = form.notes;
         } else {
-            [SGRepository initWithPlayerCaster:form.playerCaster opponentCaster:form.opponentCaster opponent:form.opponent date:form.date points:form.pointSize result:form.result killPoints:form.killPoints scenario:form.scenario controlPoints:form.controlPoints event:form.event notes:form.notes context:appDelegate.managedObjectContext];
+            [SGRepository initWithPlayerCaster:form.playerCaster opponentCaster:form.opponentCaster opponent:form.opponent date:[self normalizedDate:form.date] points:form.pointSize result:form.result killPoints:form.killPoints scenario:form.scenario controlPoints:form.controlPoints event:form.event notes:form.notes context:appDelegate.managedObjectContext];
         }
         [appDelegate saveContext];
         [self.navigationController dismissViewControllerAnimated:YES completion:nil];
@@ -88,14 +88,11 @@ - (IBAction)saveBattle:(id)sender {
 #pragma mark - Utilities
 
 - (NSDate *)normalizedDate:(NSDate *)date {
-    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+    date = [calendar startOfDayForDate:date];
     calendar.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
-    NSDateComponents *dateComponents = [calendar components:(NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:date];
-    [dateComponents setHour:12];
-    [dateComponents setMinute:0];
-    [dateComponents setSecond:0];
-    [dateComponents setNanosecond:0];
-    return [calendar dateFromComponents:dateComponents];
+    NSTimeInterval twelveHours = 12 * 3600;
+    return [[calendar startOfDayForDate:date] dateByAddingTimeInterval:twelveHours];
 }
 
 @end

SteamGenius/SGEventFormViewController.m

@@ -78,14 +78,11 @@ - (void)cancelEvent {
 #pragma mark - Utilities
 
 - (NSDate *)normalizedDate:(NSDate *)date {
-    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+    date = [calendar startOfDayForDate:date];
     calendar.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
-    NSDateComponents *dateComponents = [calendar components:(NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:date];
-    [dateComponents setHour:12];
-    [dateComponents setMinute:0];
-    [dateComponents setSecond:0];
-    [dateComponents setNanosecond:0];
-    return [calendar dateFromComponents:dateComponents];
+    NSTimeInterval twelveHours = 12 * 3600;
+    return [[calendar startOfDayForDate:date] dateByAddingTimeInterval:twelveHours];
 }
 
 @end

SteamGenius/SGFiltersFormViewController.m

@@ -112,14 +112,11 @@ - (void)reloadForm {
 #pragma mark - Utilities
 
 - (NSDate *)normalizedDate:(NSDate *)date {
-    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+    date = [calendar startOfDayForDate:date];
     calendar.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
-    NSDateComponents *dateComponents = [calendar components:(NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:date];
-    [dateComponents setHour:12];
-    [dateComponents setMinute:0];
-    [dateComponents setSecond:0];
-    [dateComponents setNanosecond:0];
-    return [calendar dateFromComponents:dateComponents];
+    NSTimeInterval twelveHours = 12 * 3600;
+    return [[calendar startOfDayForDate:date] dateByAddingTimeInterval:twelveHours];
 }
 
 @end

SteamGenius/SGRepository.m

@@ -128,14 +128,11 @@ + (BattleFilter *)initWithDisplayText:(NSString *)displayText predicate:(NSPredi
 #pragma mark - Utilities
 
 + (NSDate *)normalizedDate:(NSDate *)date {
-    NSCalendar *calendar = [NSCalendar currentCalendar];
+    NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+    date = [calendar startOfDayForDate:date];
     calendar.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
-    NSDateComponents *dateComponents = [calendar components:(NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:date];
-    [dateComponents setHour:12];
-    [dateComponents setMinute:0];
-    [dateComponents setSecond:0];
-    [dateComponents setNanosecond:0];
-    return [calendar dateFromComponents:dateComponents];
+    NSTimeInterval twelveHours = 12 * 3600;
+    return [[calendar startOfDayForDate:date] dateByAddingTimeInterval:twelveHours];
 }
 
 @end

SteamGeniusTests/SteamGeniusTests.m

@@ -73,7 +73,7 @@ - (void)testAddResult {
     // Assert
     NSFetchRequest *req = [[NSFetchRequest alloc] initWithEntityName:@"Result"];
     NSArray *arr = [_moc executeFetchRequest:req error:nil];
-    XCTAssertEqual(15, [arr count]);
+    XCTAssertEqual(19, [arr count]);
 }
 
 - (void)testAddOpponent {