Changeset 802

Timestamp:

01/30/11 18:04:01 (2 years ago)

Author:

henri

Message:

Now fully supports global and profile-only enabling and disabling

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• ProfileRecordsViewController.h (modified) (3 diffs)
• ProfileRecordsViewController.m (modified) (14 diffs)

apps/iphone/my.tel/trunk/Classes/ProfileRecordsViewController.h

@@ -21 +21 @@
 };
 
-@interface ProfileRecordsViewController : RecordViewController <HATextViewEditDelegate, UIAlertViewDelegate> {
+@interface ProfileRecordsViewController : RecordViewController <HATextViewEditDelegate, UIAlertViewDelegate, UIActionSheetDelegate> {
         NSDictionary *theProfile;
         NSString *ninfoApiId;
         NSString *ninfoText;
-        
-        BOOL showDisabledRecords;
+        NSUInteger selectedRowIndex;
 
         IBOutlet UIView *tableHeaderView;
@@ -45 +44 @@
 - (void)disableRecordsUsingGlobal:(BOOL)isGlobal;
 - (void)displayDisabledRecords:(BOOL)showDisabled;
+- (void)triggerOperationsQueueWithJson:(NSDictionary *)parsedJson;
 
 - (IBAction)didClickCancel:(id)sender;
@@ -54 +54 @@
 @property (nonatomic, retain) NSString *ninfoText;
 
-@property (nonatomic) BOOL showDisabledRecords;
-
 @property (nonatomic, retain) IBOutlet UIView *tableHeaderView;
 @property (nonatomic, retain) IBOutlet UITableViewCell *ninfoCell;

apps/iphone/my.tel/trunk/Classes/ProfileRecordsViewController.m

@@ -13 +13 @@
 #define kNINFOMaxLength 255             // NINFO max length
 
+@interface ProfileRecordsViewController (PrivateMethods)
+
+- (void)performRecordEnabling:(BOOL)enable usingGlobal:(BOOL)isGlobal;
+
+@end
+
+
 @implementation ProfileRecordsViewController
 
@@ -18 +25 @@
 @synthesize ninfoApiId;
 @synthesize ninfoText;
-
-@synthesize showDisabledRecords;
 
 @synthesize tableHeaderView;
@@ -33 +38 @@
         
         theC.theProfile = aProfile;
-        theC.showDisabledRecords = NO;
         [theC _setDidPreload:preload];
         theC.delegate = aDelegate;
@@ -189 +193 @@
 
 - (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-        // we only want to allow selection for the profile records when editing
-        if (indexPath.section == kKProfileTableViewSectionRecords) {
-                if (! self.editing) {
-                        return nil;
-                }
-                NSDictionary *uiItem = [uiArray objectAtIndex:indexPath.row];
-                if ([[uiItem valueForKey:@"global"] integerValue] == 1) {
-                        // TODO: manage globals
-                        NSAssert(FALSE, @"GLOBAL! Must show a question to disable global or cancel");
-                        return nil;
-                }               
-        }
+        // override superclass behavior
         return indexPath;
 }
@@ -217 +210 @@
                 [self.navigationController pushViewController:teC animated:YES];
         } else if (indexPath.section == kKProfileTableViewSectionRecords) {
+                selectedRowIndex = indexPath.row;
                 NSMutableDictionary *uiItem = [[uiArray objectAtIndex:indexPath.row] retain];
+                NSString *sheetTitle;
                 if ([[uiItem valueForKey:@"enabled"] integerValue] == 0) {
-                        [uiItem setValue:@"1" forKey:@"enabled"];
+                        sheetTitle = LocStr(@"Enable record:");
                 } else {
-                        [uiItem setValue:@"0" forKey:@"enabled"];
-                }
+                        sheetTitle = LocStr(@"Disable record:");
+                }
+
+                UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:sheetTitle
+                                                                                                                                 delegate:self
+                                                                                                                cancelButtonTitle:nil
+                                                                                                   destructiveButtonTitle:nil
+                                                                                                                otherButtonTitles:LocStr(@"in this profile"),LocStr(@"in ALL profiles"),nil];
+                actionSheet.actionSheetStyle = UIActionSheetStyleBlackTranslucent;
+                [actionSheet showInView:tableView];
+                [actionSheet release];          
                 [uiItem release];
-                [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
         } else if (indexPath.section == kKProfileTableViewSectionActivate) {
                 [self didClickActivate:nil];
@@ -240 +243 @@
         //Toggles the receiver into and out of editing mode.
         [super setEditing:editing animated:animated];
-        self.showDisabledRecords = editing;
         if (editing) {
                 [self displayDisabledRecords:YES];
@@ -253 +255 @@
                         buttonEditCount = 4;
                         self.navigationItem.leftBarButtonItem = nil;
-                        [self enableRecordsUsingGlobal:NO];
-                        [self getRecords];
+                        self.navigationItem.rightBarButtonItem.enabled = NO;
+                        // Now trigger the whole update cycle, starting with non-global item enabling
+                        [self triggerOperationsQueueWithJson:nil];
                 }
         }
@@ -314 +317 @@
 }
 
-- (void)updateEditButtonAndDoNothing:(NSDictionary *)parsedJson {
+- (void)triggerOperationsQueueWithJson:(NSDictionary *)parsedJson {
         // hack to ensure:
         // 1- that all enable-disable actions are done in serial order
         // 2- that the user cannot re-edit the table before all is done
         // call enableRecordsUsingGlobal:NO, and all goes from there automatically
+        self.navigationItem.rightBarButtonItem.enabled = NO;
         if (parsedJson) {
                 [[MyTelConnect sharedInstance] doNothing:parsedJson];
         }
         switch (buttonEditCount) {
-                case 4: // This case will be skipped if you start by calling enableRecordsUsingGlobal:NO
+                case 4: // This case should be skipped if you start by calling enableRecordsUsingGlobal:NO
+                        buttonEditCount--;
                         [self enableRecordsUsingGlobal:NO];
                         break;
                 case 3:
+                        buttonEditCount--;
                         [self enableRecordsUsingGlobal:YES];
                         break;
                 case 2:
+                        buttonEditCount--;
+                        [self disableRecordsUsingGlobal:YES];
+                        break;
+                case 1:
+                        buttonEditCount--;
                         [self disableRecordsUsingGlobal:NO];
                         break;
-                case 1:
-                        [self disableRecordsUsingGlobal:YES];
-                        break;
                 case 0:
-                        self.navigationItem.rightBarButtonItem = self.editButtonItem;
+                        [self getRecords];      // Necessary to resync the recordsArray
                         break;
                 default:
                         buttonEditCount = 0;
-                        self.navigationItem.rightBarButtonItem = self.editButtonItem;
+                        self.navigationItem.rightBarButtonItem.enabled = YES;
                         break;
         }
@@ -409 +417 @@
         }
         [self.delegate dataDidChangeInController:self];
-        [self displayDisabledRecords:self.showDisabledRecords];
+        [self displayDisabledRecords:self.tableView.editing];
+        self.navigationItem.rightBarButtonItem.enabled = YES;   // could have been disabled by the update queue
 }
 
@@ -557 +566 @@
 }
 
+#pragma mark UIActionSheet delegate methods
+
+- (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex {
+        if (buttonIndex > 1)
+                return;
+        NSMutableDictionary *uiItem = [[uiArray objectAtIndex:selectedRowIndex] retain];
+    if (buttonIndex == 0) {
+                // this profile
+                [uiItem setValue:@"0" forKey:@"global"];
+    } else if (buttonIndex == 1) {
+                // all profiles
+                [uiItem setValue:@"1" forKey:@"global"];
+    }
+        if ([[uiItem valueForKey:@"enabled"] integerValue] == 0) {
+                [uiItem setValue:@"1" forKey:@"enabled"];
+        } else {
+                [uiItem setValue:@"0" forKey:@"enabled"];
+        }
+        [uiItem release];
+        NSIndexPath *selectedRowPath = [NSIndexPath indexPathForRow:selectedRowIndex inSection:kKProfileTableViewSectionRecords];
+        [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObject:selectedRowPath] withRowAnimation:UITableViewRowAnimationFade];
+}
+
+
 #pragma mark -
 #pragma mark Data management
@@ -736 +769 @@
 
 - (void)enableRecordsUsingGlobal:(BOOL)isGlobal {
-//      inputRecords = {
-//      domainName: "cartman.tel",
-//      profiles: [23, 35],
-//      apiIds: [23, 2, 22]
-//      };
-//      
-//      successResult = {
-//      success: true,
-//      actionMessages: ["records enabled"
-//                                       "2nd message here",
-//                                       "3rd message here"]
-//      }; 
-
-        buttonEditCount--;
+        [self performRecordEnabling:YES usingGlobal:isGlobal];
+}
+
+- (void)disableRecordsUsingGlobal:(BOOL)isGlobal {
+        [self performRecordEnabling:NO usingGlobal:isGlobal];
+}
+
+- (void)performRecordEnabling:(BOOL)enable usingGlobal:(BOOL)isGlobal {
+        //      inputRecords = {
+        //      domainName: "cartman.tel",
+        //      profiles: [23, 35],
+        //      apiIds: [23, 2, 22]
+        //      };
+        //      
+        //      successResult = {
+        //      success: true,
+        //      actionMessages: ["records disabled"
+        //                                       "2nd message here",
+        //                                       "3rd message here"]
+        //      }; 
+        NSString *theAction;
+        if (enable) {
+                theAction = @"enablerecords";
+        } else {
+                theAction = @"disablerecords";
+        }
+        
         NSMutableArray *apiIdArray = [NSMutableArray arrayWithCapacity:[uiArray count]];
         for (NSDictionary *theRow in uiArray) {
                 if ([[theRow valueForKey:@"global"] integerValue] != isGlobal) {
-                                // We don't modify records that are not what we're asking for: either global or profile-specific
+                        // We don't modify records that are not what we're asking for: either global or profile-specific
                         continue;
                 }
-                if ([[theRow valueForKey:@"enabled"] integerValue] == 1) {
+                if ([[theRow valueForKey:@"enabled"] boolValue] == enable) {
                         [apiIdArray addObject:[theRow objectForKey:@"apiId"]];
                 }
         }
         if ([apiIdArray count] == 0) {
-                [self performSelector:@selector(updateEditButtonAndDoNothing:) withObject:nil];
+                [self performSelector:@selector(triggerOperationsQueueWithJson:) withObject:nil];
                 return;
         }
@@ -767 +813 @@
         Record *conn = [[[Record alloc] init] autorelease];
         [conn setTheDelegate:self];
-        [conn setActionSel:@selector(updateEditButtonAndDoNothing:)];
-        [conn setConnectionUrl:[conn urlFromAction:@"enablerecords"]];
+        [conn setActionSel:@selector(triggerOperationsQueueWithJson:)];
+        [conn setConnectionUrl:[conn urlFromAction:theAction]];
         
         NSMutableDictionary *requestData = [[NSMutableDictionary dictionaryWithCapacity:3] retain];
@@ -779 +825 @@
         }
         [requestData setObject:profiles forKey:@"profiles"];
-                
+        
         [requestData setObject:apiIdArray forKey:@"apiIds"];
         
@@ -786 +832 @@
         [requestData release];
 }
-
-- (void)disableRecordsUsingGlobal:(BOOL)isGlobal {
-//      inputRecords = {
-//      domainName: "cartman.tel",
-//      profiles: [23, 35],
-//      apiIds: [23, 2, 22]
-//      };
-//      
-//      successResult = {
-//      success: true,
-//      actionMessages: ["records disabled"
-//                                       "2nd message here",
-//                                       "3rd message here"]
-//      }; 
-
-        buttonEditCount--;
-        NSMutableArray *apiIdArray = [NSMutableArray arrayWithCapacity:[uiArray count]];
-        for (NSDictionary *theRow in uiArray) {
-                if ([[theRow valueForKey:@"global"] integerValue] != isGlobal) {
-                        // We don't modify records that are not what we're asking for: either global or profile-specific
-                        continue;
-                }
-                if ([[theRow valueForKey:@"enabled"] integerValue] == 1) {
-                        [apiIdArray addObject:[theRow objectForKey:@"apiId"]];
-                }
-        }
-        if ([apiIdArray count] == 0) {
-                [self performSelector:@selector(updateEditButtonAndDoNothing:) withObject:nil];
-                return;
-        }
-        
-        Record *conn = [[[Record alloc] init] autorelease];
-        [conn setTheDelegate:self];
-        [conn setActionSel:@selector(updateEditButtonAndDoNothing:)];
-        [conn setConnectionUrl:[conn urlFromAction:@"disablerecords"]];
-        
-        NSMutableDictionary *requestData = [[NSMutableDictionary dictionaryWithCapacity:3] retain];
-        [requestData setObject:[self.delegate domain] forKey:@"domainName"];
-        NSArray *profiles;
-        if (isGlobal) {
-                profiles = [NSArray arrayWithObject:@"-1"];     // global profile
-        } else {
-                profiles = [NSArray arrayWithObject:[self.theProfile objectForKey:@"id"]];
-        }
-        [requestData setObject:profiles forKey:@"profiles"];
-                
-        [requestData setObject:apiIdArray forKey:@"apiIds"];
-        
-        [conn setPayload:requestData];
-        [conn performLookup:TRUE];
-        [requestData release];
-}
-
 @end