diff --git a/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate index c1ebd05f2de67630a7d36533e72fa98ff50e6d0c..6001fb6e5fdffadcb9e1829483ef21900d492d98 100644 Binary files a/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ 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 ca1157d58c5ebde691c01bd289e80ff6436c52dc..d05cb99ca8969543a5977d0b91942d8143d2d49a 100644 Binary files a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.h b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.h index a50d345170c866ce30775b01fbec9ce3e412cfa3..e2a08d8d6b48005a2ec304d87792e7c6584eef6a 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.h +++ b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.h @@ -29,7 +29,6 @@ @property (strong, nonatomic) CISDOBIpadEntity *detailItem; @property (weak, nonatomic) IBOutlet UITableView *propertiesTableView; - @property (weak, nonatomic) IBOutlet UILabel *summaryHeaderLabel; @property (weak, nonatomic) IBOutlet UILabel *summaryLabel; @property (weak, nonatomic) IBOutlet UILabel *identifierLabel; diff --git a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m index 24c0e17cc61ec86c90695c0b3663c0edf77ecd42..e09340e30e8cae6c9c11ecb9ff8e59224d530670 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m @@ -56,6 +56,12 @@ self.summaryHeaderLabel.text = [[self.detailItem valueForKey:@"summaryHeader"] description]; self.summaryLabel.text = [[self.detailItem valueForKey:@"summary"] description]; self.identifierLabel.text = [[self.detailItem valueForKey:@"identifier"] description]; + + if (self.detailItem.imageUrl) { + NSURL *imageUrl = [NSURL URLWithString: self.detailItem.imageUrl]; + NSData *imageData = [NSData dataWithContentsOfURL: imageUrl]; + self.imageView.image =[UIImage imageWithData: imageData]; + } [self.propertiesTableView reloadData]; } diff --git a/openbis-ipad/openBIS/openBIS/readme.md b/openbis-ipad/openBIS/openBIS/readme.md index 423b34debfd33a06f3503ca8568910972268af7e..7220528cad5318c92340142166af05d8ed264cf3 100644 --- a/openbis-ipad/openBIS/openBIS/readme.md +++ b/openbis-ipad/openBIS/openBIS/readme.md @@ -1,4 +1,6 @@ Setup ===== -This project is currently being used to test out development ideas. It is not connected to a live instance of openBIS. Data needs to be retrieved form openBIS using the openBISData target and stored in a file that is located in the DevData/openBISData.sqlite. \ No newline at end of file +This project is currently being used to test out development ideas. It is not connected to a live instance of openBIS. Data needs to be retrieved form openBIS using the openBISData target and stored in a file that is located in the DevData/openBISData.sqlite. + +To run this preparation step, run the openBISdata target and move the resulting file from Research/openBISData.sqlite to DevData/openBISData.sqlite \ No newline at end of file