Add figures counts in each tableview section header (#5).

seiza · May 29, 2012 · 8e26a0d · 8e26a0d
1 parent c2c5dc8
commit 8e26a0d
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 4 deletions.
diff --git a/Legomni.xcodeproj/project.pbxproj b/Legomni.xcodeproj/project.pbxproj
@@ -127,6 +127,7 @@
 		C483C3F615752CEF00E7F77C /* SkaterGirl.plist in Resources */ = {isa = PBXBuildFile; fileRef = C483C3E615752CEF00E7F77C /* SkaterGirl.plist */; };
 		C483C3F715752CEF00E7F77C /* Sleepyhead.plist in Resources */ = {isa = PBXBuildFile; fileRef = C483C3E715752CEF00E7F77C /* Sleepyhead.plist */; };
 		C483C3F815752CEF00E7F77C /* Surgeon.plist in Resources */ = {isa = PBXBuildFile; fileRef = C483C3E815752CEF00E7F77C /* Surgeon.plist */; };
+		C483C3FB1575367E00E7F77C /* SerieTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C483C3FA1575367E00E7F77C /* SerieTests.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -270,6 +271,8 @@
 		C483C3E615752CEF00E7F77C /* SkaterGirl.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SkaterGirl.plist; sourceTree = "<group>"; };
 		C483C3E715752CEF00E7F77C /* Sleepyhead.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Sleepyhead.plist; sourceTree = "<group>"; };
 		C483C3E815752CEF00E7F77C /* Surgeon.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Surgeon.plist; sourceTree = "<group>"; };
+		C483C3F91575367E00E7F77C /* SerieTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerieTests.h; sourceTree = "<group>"; };
+		C483C3FA1575367E00E7F77C /* SerieTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SerieTests.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -363,6 +366,8 @@
 			children = (
 				C40FCDEA156D560900249D22 /* LegomniTests.h */,
 				C40FCDEB156D560900249D22 /* LegomniTests.m */,
+				C483C3F91575367E00E7F77C /* SerieTests.h */,
+				C483C3FA1575367E00E7F77C /* SerieTests.m */,
 				C40FCDE5156D560900249D22 /* Supporting Files */,
 			);
 			path = LegomniTests;
@@ -795,6 +800,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				C40FCDEC156D560900249D22 /* LegomniTests.m in Sources */,
+				C483C3FB1575367E00E7F77C /* SerieTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Legomni/MasterViewController.m b/Legomni/MasterViewController.m
@@ -107,7 +107,10 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 }
 
 -(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-    return [NSString stringWithFormat:@"%@ %d", (NSLocalizedString(@"Série", @"Série")), [self serieForIndex:section].index];
+    Serie* serie = [self serieForIndex:section];
+    int count = [serie differentFiguresCount];
+    int doublesCount = [serie doubleCount];
+    return [NSString stringWithFormat:@"%@ %d (%d/16 + %d)", (NSLocalizedString(@"Série", @"Série")), serie.index, count, doublesCount];
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {

diff --git a/Legomni/Models/Serie.h b/Legomni/Models/Serie.h
@@ -15,4 +15,7 @@
 
 - (id)initWithIndex:(int)index;
 
+- (int) differentFiguresCount;
+- (int) doubleCount;
+
 @end
diff --git a/Legomni/Models/Serie.m b/Legomni/Models/Serie.m
@@ -35,4 +35,21 @@ - (id)initWithIndex:(int)i {
     return self;
 }
 
+
+- (int) differentFiguresCount {
+    int count = 0;
+    for (Figure* f in self.figures) {
+        if (f.quantity > 0) ++count;
+    }
+    return count;
+}
+
+- (int) doubleCount {
+    int count = 0;
+    for (Figure* f in self.figures) {
+        if (f.quantity > 1) count += f.quantity - 1;
+    }
+    return count;
+}
+
 @end
diff --git a/LegomniTests/LegomniTests.h b/LegomniTests/LegomniTests.h
@@ -3,7 +3,7 @@
 //  LegomniTests
 //
 //  Created by Jacques COUVREUR on 23.05.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//  Copyright (c) 2012 me.couvreur.jacques. All rights reserved.
 //
 
 #import <SenTestingKit/SenTestingKit.h>

diff --git a/LegomniTests/LegomniTests.m b/LegomniTests/LegomniTests.m
@@ -3,7 +3,7 @@
 //  LegomniTests
 //
 //  Created by Jacques COUVREUR on 23.05.12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//  Copyright (c) 2012 me.couvreur.jacques. All rights reserved.
 //
 
 #import "LegomniTests.h"
@@ -26,7 +26,7 @@ - (void)tearDown
 
 - (void)testExample
 {
-    STFail(@"Unit tests are not implemented yet in LegomniTests");
+   // STFail(@"Unit tests are not implemented yet in LegomniTests");
 }
 
 @end
diff --git a/LegomniTests/SerieTests.h b/LegomniTests/SerieTests.h
@@ -0,0 +1,13 @@
+//
+//  SerieTests.h
+//  Legomni
+//
+//  Created by Jacques COUVREUR on 29.05.12.
+//  Copyright (c) 2012 me.couvreur. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface SerieTests : SenTestCase
+
+@end
diff --git a/LegomniTests/SerieTests.m b/LegomniTests/SerieTests.m
@@ -0,0 +1,40 @@
+//
+//  SerieTests.m
+//  Legomni
+//
+//  Created by Jacques COUVREUR on 29.05.12.
+//  Copyright (c) 2012 me.couvreur. All rights reserved.
+//
+
+#import "SerieTests.h"
+#import "Serie.h"
+#import "Figure.h"
+
+@implementation SerieTests
+
+- (void) test_differentFiguresCount_and_doubleCount {
+    Serie* serie = [[Serie alloc] initWithIndex:3];
+    {
+        Figure* f = [[Figure alloc] initWithCode:@"0" andSerie:3];
+        [serie.figures addObject:f];
+        f.quantity = 0;
+        STAssertEquals([serie differentFiguresCount], 0, nil);
+        STAssertEquals([serie doubleCount], 0, nil);
+    }
+    {
+        Figure* f = [[Figure alloc] initWithCode:@"1" andSerie:3];
+        [serie.figures addObject:f];
+        f.quantity = 1;
+        STAssertEquals([serie differentFiguresCount], 1, nil);
+        STAssertEquals([serie doubleCount], 0, nil);
+    }
+    {
+        Figure* f = [[Figure alloc] initWithCode:@"2" andSerie:3];
+        [serie.figures addObject:f];
+        f.quantity = 2;
+        STAssertEquals([serie differentFiguresCount], 2, nil);
+        STAssertEquals([serie doubleCount], 1, nil);
+    }
+}
+
+@end