@@ -21,7 +21,7 @@ { personID = pk; firstName = [fname copy]; - lastName = [lname copy]; + lastName = [lname copy]; birthdate = [bdate copy]; } @@ -30,9 +30,18 @@ } - ( NSString * ) description { - return [ NSString stringWithFormat: @"firstName:%@;lastName:%@", firstName, lastName]; + return [ NSString stringWithFormat: @"firstName:%@;lastName:%@;dirty=%d", firstName, lastName, dirty]; } +- (BOOL)isEqual:(id)anObject { + if([((Person*)anObject) personID]==personID) { + return YES; + } else { + return NO; + } +} + + -(void)dealloc { Classes/bo/Person.m @@ -15,5 +15,5 @@ + (NSMutableArray*)getPersons; + (void)removePerson:(NSInteger)index; - ++ (void)updateAll; @end Classes/db/PersonDAO.h @@ -41,6 +41,8 @@ static NSString* cacheKey = @"persons"; person = [[Person alloc] initWithPersonData:key firstName:firstName lastName:lastName birthDate:[NSDate date]]; person.colorID = 2; person.movieID = 2; + + NSLog(@"%@", person); [array addObject:person]; [person release]; } @@ -55,10 +57,49 @@ static NSString* cacheKey = @"persons"; return array; } -+ (void)removePerson:(NSInteger)index { - NSMutableArray *array = (NSMutableArray*) [DBManager getFromCache:cacheKey]; - [array removeObjectAtIndex:index]; ++ (void)removePerson:(NSInteger)id { + const char *sql = "delete from person where id = ?"; + sqlite3_stmt *deleteStatement; + sqlite3* database = [DBManager getDatabase]; + + if (sqlite3_prepare_v2(database, sql, -1, &deleteStatement, NULL) != SQLITE_OK) { + NSAssert1(0, @"Error: failed to prepare statement with message '%s'.", sqlite3_errmsg(database)); + } + + // Bind the primary key variable. + sqlite3_bind_int(deleteStatement, 1, id); + // Execute the query. + int success = sqlite3_step(deleteStatement); + // Reset the statement for future use. + sqlite3_reset(deleteStatement); + // Handle errors. + if (success != SQLITE_DONE) { + NSAssert1(0, @"Error: failed to delete from database with message '%s'.", sqlite3_errmsg(database)); + } + + [DBManager removeFromCache:cacheKey]; + +} + ++ (void)updateAll { + const char *sql = "update person set firstname = 'Scott'"; + sqlite3_stmt *updatetStatement; + sqlite3* database = [DBManager getDatabase]; + + if (sqlite3_prepare_v2(database, sql, -1, &updatetStatement, NULL) != SQLITE_OK) { + NSAssert1(0, @"Error: failed to prepare statement with message '%s'.", sqlite3_errmsg(database)); + } + // Bind the primary key variable. + //sqlite3_bind_int(delete_statement, 1, primaryKey); + // Execute the query. + int success = sqlite3_step(updatetStatement); + // Reset the statement for future use. + sqlite3_reset(updatetStatement); + // Handle errors. + if (success != SQLITE_DONE) { + NSAssert1(0, @"Error: failed to delete from database with message '%s'.", sqlite3_errmsg(database)); + } } @end Classes/db/PersonDAO.m @@ -35,8 +35,8 @@ [super setEditing:editing animated:animated]; //[self.navigationItem setHidesBackButton:editing animated:animated]; - if(!editing) { - NSLog(@"TODO: Save to database!"); + if([person dirty]) { + NSLog(@"TODO: Save to database!, %@", person); } [tableView reloadData]; Classes/ux/DetailViewController.m @@ -11,7 +11,6 @@ #define CRUD_ROW_INDEX 0 #define TABBAR_ROW_INDEX 1 -#define BUSY_ROW_INDEX 2 #define SETTINGS_ROW_INDEX 0 @@ -94,7 +93,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { switch (section) { case TASKS_SECTION: - return 3; + return 2; case SETTINGS_SECTION: return 1; default: @@ -125,8 +124,6 @@ case TABBAR_ROW_INDEX: cell.text = @"Cloud Services"; break; - case BUSY_ROW_INDEX: - cell.text = @"Busy Activity"; } break; case SETTINGS_SECTION: @@ -165,15 +162,6 @@ [self.navigationController pushViewController:controller2 animated:YES]; self.navigationController.navigationBarHidden = NO; break; - case BUSY_ROW_INDEX: - if(busyViewController==nil) { - busyViewController = [[BusyViewController alloc] initWithNibName:@"BusyViewController" bundle:nil]; - } - - BusyViewController *controller3 = self.busyViewController; - [self.navigationController pushViewController:controller3 animated:YES]; - - break; } break; case SETTINGS_SECTION: Classes/ux/RootViewController.m @@ -17,8 +17,8 @@ UINavigationController *addNavigationController; IBOutlet UITableView *tableView; IBOutlet UISearchBar *searchBar; - NSArray *indexedLetters; - NSArray *displayList; + NSMutableArray *indexedLetters; + NSMutableArray *displayList; } @property (nonatomic, retain) DetailViewController *detailViewController; @@ -26,8 +26,8 @@ @property (nonatomic, retain) UINavigationController *addNavigationController; @property (nonatomic, readwrite, retain) UITableView *tableView; @property (nonatomic, readwrite, retain) UISearchBar *searchBar; -@property (nonatomic, retain) NSArray *indexedLetters; -@property (nonatomic, retain) NSArray *displayList; +@property (nonatomic, retain) NSMutableArray *indexedLetters; +@property (nonatomic, retain) NSMutableArray *displayList; - (IBAction)addButtonClicked; - (IBAction)switchChanged:(id)sender; Classes/ux/TableViewController.h @@ -71,8 +71,6 @@ } - (void)viewWillAppear:(BOOL)animated { - - [(UITableView*)self.tableView reloadData]; } - (void)setEditing:(BOOL)editing animated:(BOOL)animated @@ -96,7 +94,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { // Number of rows is the number of names in the region dictionary for the specified section NSDictionary *letterDictionary = [displayList objectAtIndex:section]; - NSArray *zonesForLetter = [letterDictionary objectForKey:@"persons"]; + NSMutableArray *zonesForLetter = [letterDictionary objectForKey:@"persons"]; return [zonesForLetter count]; } @@ -146,7 +144,7 @@ UILabel *label = (UILabel *)[cell viewWithTag:55]; NSDictionary *letterDictionary = [displayList objectAtIndex:indexPath.section]; - NSArray *zonesForLetter = [letterDictionary objectForKey:@"persons"]; + NSMutableArray *zonesForLetter = [letterDictionary objectForKey:@"persons"]; Person *person = [zonesForLetter objectAtIndex:indexPath.row]; // Set the cell's text to the name of the time zone at the row @@ -157,7 +155,13 @@ - (void)tableView:(UITableView *)tv commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { if (editingStyle == UITableViewCellEditingStyleDelete) { - [PersonDAO removePerson:indexPath.row]; + NSDictionary *letterDictionary = [displayList objectAtIndex:indexPath.section]; + NSMutableArray *zonesForLetter = [letterDictionary objectForKey:@"persons"]; + Person *person = [zonesForLetter objectAtIndex:indexPath.row]; + + [PersonDAO removePerson:[person personID]]; + [zonesForLetter removeObjectAtIndex:indexPath.row]; + [tv deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade]; } } @@ -205,7 +209,7 @@ NSMutableArray *persons = [[NSMutableArray alloc] init]; - self.indexedLetters = [[indexedNames allKeys] sortedArrayUsingSelector:@selector(compare:)]; + self.indexedLetters = (NSMutableArray*) [[indexedNames allKeys] sortedArrayUsingSelector:@selector(compare:)]; NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"lastName" ascending:YES]; NSArray *sortDescriptors = [NSArray arrayWithObject:sortDescriptor]; Classes/ux/TableViewController.m @@ -264,23 +264,21 @@ <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> <array> <string>29B97314FDCFA39411CA2CEA</string> - <string>D2533CF30E4514EF0062738B</string> <string>D2BFF4020E3EB148009F8297</string> + <string>D2BFF5670E3EC674009F8297</string> <string>29B97317FDCFA39411CA2CEA</string> - <string>D2BFF4780E3EB439009F8297</string> - <string>D2BFF4690E3EB3B4009F8297</string> <string>1CC0EA4004350EF90041110B</string> </array> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>30</integer> - <integer>14</integer> + <integer>24</integer> + <integer>8</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 308}, {254, 652}}</string> + <string>{{0, 0}, {254, 652}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -329,32 +327,35 @@ <key>_historyCapacity</key> <integer>10</integer> <key>bookmark</key> - <string>D24E2F0F0E464A55005E308A</string> + <string>D24E2FF10E479C6F005E308A</string> <key>history</key> <array> - <string>D24E2E6E0E464297005E308A</string> - <string>D24E2E6F0E464297005E308A</string> - <string>D24E2EAC0E46451E005E308A</string> - <string>D24E2ECE0E464668005E308A</string> - <string>D24E2ECF0E464668005E308A</string> - <string>D24E2ED00E464668005E308A</string> - <string>D24E2EDC0E4646B3005E308A</string> - <string>D24E2EE60E4647DA005E308A</string> - <string>D24E2F080E464A2E005E308A</string> - <string>D24E2F090E464A2E005E308A</string> + <string>D24E2F820E476145005E308A</string> + <string>D24E2F930E4765BB005E308A</string> + <string>D24E2F940E4765BB005E308A</string> + <string>D24E2FA70E479693005E308A</string> + <string>D24E2FA80E479693005E308A</string> + <string>D24E2FCA0E479A09005E308A</string> + <string>D24E2FCB0E479A09005E308A</string> + <string>D24E2FD50E479AD0005E308A</string> + <string>D24E2FDC0E479B5B005E308A</string> + <string>D24E2FDD0E479B5B005E308A</string> </array> <key>nextStack</key> <array> - <string>D24E2F0A0E464A2E005E308A</string> + <string>D24E2FDE0E479B5B005E308A</string> </array> <key>prevStack</key> <array> - <string>D24E2ED20E464668005E308A</string> - <string>D24E2ED30E464668005E308A</string> - <string>D24E2EE90E4647DA005E308A</string> - <string>D24E2EEA0E4647DA005E308A</string> - <string>D24E2EF20E464899005E308A</string> - <string>D24E2EFD0E464947005E308A</string> + <string>D24E2F380E465B11005E308A</string> + <string>D24E2F420E472BBD005E308A</string> + <string>D24E2F970E4765BB005E308A</string> + <string>D24E2F980E4765BB005E308A</string> + <string>D24E2F990E4765BB005E308A</string> + <string>D24E2FAB0E479693005E308A</string> + <string>D24E2FAD0E479693005E308A</string> + <string>D24E2FAE0E479693005E308A</string> + <string>D24E2FD60E479AD0005E308A</string> </array> </dict> <key>SplitCount</key> @@ -366,14 +367,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1164, 482}}</string> + <string>{{0, 0}, {1164, 379}}</string> <key>RubberWindowFrame</key> <string>0 144 1440 732 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>482pt</string> + <string>379pt</string> </dict> <dict> <key>ContentConfiguration</key> @@ -386,14 +387,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 487}, {1164, 183}}</string> + <string>{{0, 384}, {1164, 286}}</string> <key>RubberWindowFrame</key> <string>0 144 1440 732 0 0 1440 878 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> - <string>183pt</string> + <string>286pt</string> </dict> </array> <key>Proportion</key> @@ -550,10 +551,10 @@ <array> <string>D24E2D400E45DD64005E308A</string> <string>D24E2D410E45DD64005E308A</string> + <string>1C78EAAD065D492600B07095</string> <string>1C530D57069F1CE1000CFCEE</string> <string>1CD10A99069EF8BA00B06720</string> <string>D23823480E375E5B00865DF0</string> - <string>1C78EAAD065D492600B07095</string> <string>/Users/scott/sandbox/iphone/iPhone-Sandbox/iPhone-Sandbox.xcodeproj</string> </array> <key>WindowString</key> @@ -580,21 +581,21 @@ <key>PBXProjectModuleGUID</key> <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> - <string>BusyViewController.m</string> + <string>TableViewController.m</string> <key>StatusBarVisibility</key> <true/> </dict> <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {982, 284}}</string> + <string>{{0, 0}, {1440, 400}}</string> <key>RubberWindowFrame</key> - <string>309 261 982 617 0 0 1440 878 </string> + <string>0 145 1440 733 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>284pt</string> + <string>400pt</string> </dict> <dict> <key>ContentConfiguration</key> @@ -611,9 +612,9 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 289}, {982, 287}}</string> + <string>{{0, 405}, {1440, 287}}</string> <key>RubberWindowFrame</key> - <string>309 261 982 617 0 0 1440 878 </string> + <string>0 145 1440 733 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXBuildResultsModule</string> @@ -622,7 +623,7 @@ </dict> </array> <key>Proportion</key> - <string>576pt</string> + <string>692pt</string> </dict> </array> <key>Name</key> @@ -643,7 +644,7 @@ <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.buildV3</string> <key>WindowString</key> - <string>309 261 982 617 0 0 1440 878 </string> + <string>0 145 1440 733 0 0 1440 878 </string> <key>WindowToolGUID</key> <string>D23823480E375E5B00865DF0</string> <key>WindowToolIsVisible</key> @@ -789,12 +790,14 @@ <key>Dock</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> - <string></string> + <string>TableViewController.m</string> <key>StatusBarVisibility</key> <true/> </dict> @@ -815,8 +818,6 @@ <string>359pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -895,7 +896,7 @@ <key>Frame</key> <string>{{0, 0}, {1002, 508}}</string> <key>RubberWindowFrame</key> - <string>359 303 1002 549 0 0 1440 878 </string> + <string>165 285 1002 549 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXDebugCLIModule</string> @@ -924,11 +925,11 @@ <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.consoleV3</string> <key>WindowString</key> - <string>359 303 1002 549 0 0 1440 878 </string> + <string>165 285 1002 549 0 0 1440 878 </string> <key>WindowToolGUID</key> <string>1C78EAAD065D492600B07095</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>Identifier</key> iPhone-Sandbox.xcodeproj/scott.mode1v3 9e653c5a139b6dbbe2c1e250839f53e876f2be08 Scott F. Walter iamjediknight@gmail.com http://github.com/iamjediknight/iphone-sandbox/commit/00da516039ac9af6d2acb5f984da86c202f2a33e 00da516039ac9af6d2acb5f984da86c202f2a33e 2008-08-04T13:22:40-07:00 2008-08-04T13:22:40-07:00 delete functionality f6581857b08db96d959d0eeea111980cdbaed27f Scott F. Walter iamjediknight@gmail.com