From e17fdb0d7065e1cc5be2a3a95b23e2817d4feea9 Mon Sep 17 00:00:00 2001 From: cramakri <cramakri> Date: Fri, 12 Oct 2012 12:44:40 +0000 Subject: [PATCH] Master view controller now fully uses the model SVN: 27168 --- .../UserInterfaceState.xcuserstate | Bin 58059 -> 58093 bytes .../openBIS/CISDOBMasterViewController.m | 18 ++++++++++++------ .../openBIS/openBIS/CISDOBOpenBisModel.h | 9 +++++++-- .../openBIS/openBIS/CISDOBOpenBisModel.m | 12 ++++++++++++ 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate index 90b853ce2aee4e36e9b026d16e6b77b5e5c93dbb..0202be35a164aa776ec32b7a689a5db0108646b1 100644 GIT binary patch delta 7804 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 E2lC`)%m4rY delta 7885 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 Sr9p$QzqGzzf4_b2S@=I(^kD%2 diff --git a/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m index f6000650376..20b36ba1779 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m @@ -29,6 +29,7 @@ @interface CISDOBMasterViewController () - (void)configureCell:(UITableViewCell *)cell atIndexPath:(NSIndexPath *)indexPath; +- (void)initializeDrillDownFrom:(CISDOBMasterViewController *)parent; @end @implementation CISDOBMasterViewController @@ -126,14 +127,13 @@ // Segue to the detail view unless we are on the ipad if ([[UIDevice currentDevice] userInterfaceIdiom] != UIUserInterfaceIdiomPad) return; - CISDOBIpadEntity *object = [self.openBisModel objectAtIndexPath: indexPath]; - if ([object.childrenPermIds count] > 0) { + CISDOBIpadEntity *object = [self.openBisModel selectObjectAtIndexPath: indexPath]; + if ([self.openBisModel isSelectionGroup]) { UIStoryboard *storyboard = self.storyboard; - CISDOBMasterViewController *controller = [storyboard instantiateViewControllerWithIdentifier: @"Master"]; - controller.openBisModel = self.openBisModel; - controller.title = object.summaryHeader; + CISDOBMasterViewController *child = [storyboard instantiateViewControllerWithIdentifier: @"Master"]; + [child initializeDrillDownFrom: self]; - [self.navigationController pushViewController: controller animated: YES]; + [self.navigationController pushViewController: child animated: YES]; } else { self.detailViewController.detailItem = object; } @@ -161,6 +161,12 @@ } } +- (void)initializeDrillDownFrom:(CISDOBMasterViewController *)parent +{ + self.openBisModel = parent.openBisModel; + self.title = self.openBisModel.selectedObject.summaryHeader; +} + #pragma mark - Fetched results controller - (void)controllerWillChangeContent:(NSFetchedResultsController *)controller diff --git a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h index f5175614ece..865c2ee0364 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h +++ b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h @@ -28,20 +28,25 @@ * \brief A model for the interaction with openBIS. */ @interface CISDOBOpenBisModel : NSObject <NSFetchedResultsControllerDelegate> { - + CISDOBIpadEntity *_selectedObject; } @property (strong, nonatomic) NSFetchedResultsController *fetchedResultsController; @property (strong, nonatomic) NSManagedObjectContext *managedObjectContext; @property (weak, nonatomic) id <NSFetchedResultsControllerDelegate> delegate; +@property (readonly) CISDOBIpadEntity *selectedObject; // Model - - (NSInteger)numberOfSections; //!< Get the number of categories for the current selection - (NSInteger)numberOfEntitiesInSection:(NSInteger)section; - (NSString *)titleForHeaderInSection:(NSInteger)section; - (CISDOBIpadEntity *)objectAtIndexPath:(NSIndexPath *)indexPath; +// Selection +//! Select the object and return it +- (CISDOBIpadEntity *)selectObjectAtIndexPath:(NSIndexPath *)indexPath; +- (BOOL)isSelectionGroup; //!< Return YES if the selected object is a group (has children) + // Actions - (BOOL)insertNewObjectOrError:(NSError **)error; //!< Return YES if operation succeeded - (BOOL)deleteObjectAtIndexPath:(NSIndexPath *)indexPath error:(NSError **)error; //!< Return YES if operation succeeded diff --git a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m index 3cb5409924c..33da2d3f605 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m @@ -51,6 +51,18 @@ return [self.fetchedResultsController objectAtIndexPath:indexPath]; } +#pragma mark - Selection +- (CISDOBIpadEntity *)selectObjectAtIndexPath:(NSIndexPath *)indexPath +{ + _selectedObject = [self objectAtIndexPath: indexPath]; + return _selectedObject; +} + +- (BOOL)isSelectionGroup +{ + return [_selectedObject.childrenPermIds count] > 0; +} + #pragma mark - Actions - (BOOL)insertNewObjectOrError:(NSError **)error { -- GitLab