diff --git a/openbis-ipad/BisKit/Classes/CISDOBIpadService.h b/openbis-ipad/BisKit/Classes/CISDOBIpadService.h index 07410da84536fc3fe0bfdb92ec7e0f204b05bdab..4437b31151a02ad8978c7abcbb28ddbcc741474b 100644 --- a/openbis-ipad/BisKit/Classes/CISDOBIpadService.h +++ b/openbis-ipad/BisKit/Classes/CISDOBIpadService.h @@ -67,14 +67,14 @@ enum CISOBIpadServiceErrorCode { NSArray* _content; } -@property(readonly) NSString *summaryHeader; -@property(readonly) NSString *summary; -@property(readonly) NSString *identifier; @property(readonly) NSString *permId; @property(readonly) NSString *refcon; @property(readonly) NSString *category; -@property(readonly) NSString *imageUrl; +@property(readonly) NSString *summaryHeader; +@property(readonly) NSString *summary; @property(readonly) NSString *children; //<! The permIds of the children as a JSON string +@property(readonly) NSString *identifier; +@property(readonly) NSString *imageUrl; @property(readonly) NSString *properties; //<! The properties as a JSON string. @end diff --git a/openbis-ipad/BisKit/Classes/CISDOBIpadService.m b/openbis-ipad/BisKit/Classes/CISDOBIpadService.m index 795e0a45b6c325283c9449cc274301775f76e60b..71e8cfd7211a2fe599e0f190b66e61c0371024e9 100644 --- a/openbis-ipad/BisKit/Classes/CISDOBIpadService.m +++ b/openbis-ipad/BisKit/Classes/CISDOBIpadService.m @@ -192,15 +192,14 @@ NSString *const CISDOBIpadServiceErrorDomain = @"CISDOBIpadServiceErrorDomain"; - (NSString *)stringContentValueAtIndex:(NSUInteger)index { return [[_content objectAtIndex: index] objectForKey: @"value"]; } - -- (NSString *)summaryHeader { return [self stringContentValueAtIndex: 0]; } -- (NSString *)summary { return [self stringContentValueAtIndex: 1]; } -- (NSString *)identifier { return [self stringContentValueAtIndex: 2]; } -- (NSString *)permId { return [self stringContentValueAtIndex: 3]; } -- (NSString *)refcon { return [self stringContentValueAtIndex: 4]; } -- (NSString *)category { return [self stringContentValueAtIndex: 5]; } -- (NSString *)imageUrl { return [self stringContentValueAtIndex: 6]; } -- (NSString *)children { return [self stringContentValueAtIndex: 7]; } +- (NSString *)permId { return [self stringContentValueAtIndex: 0]; } +- (NSString *)refcon { return [self stringContentValueAtIndex: 1]; } +- (NSString *)category { return [self stringContentValueAtIndex: 2]; } +- (NSString *)summaryHeader { return [self stringContentValueAtIndex: 3]; } +- (NSString *)summary { return [self stringContentValueAtIndex: 4]; } +- (NSString *)children { return [self stringContentValueAtIndex: 5]; } +- (NSString *)identifier { return [self stringContentValueAtIndex: 6]; } +- (NSString *)imageUrl { return [self stringContentValueAtIndex: 7]; } - (NSString *)properties { return [self stringContentValueAtIndex: 8]; } @end 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 f2e3edcd60651cda8d778bd5b267f8f37075354f..9cbdf7b6270945bb7af9a21bc82b5d8480592964 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/ipad-example-data/ipad-ui/1/dss/reporting-plugins/ipad-read-service-v1/ipad_read.py b/openbis-ipad/ipad-example-data/ipad-ui/1/dss/reporting-plugins/ipad-read-service-v1/ipad_read.py index f5bac895310e7543916e9af0e5b43b125c7fa37c..17898813ddb6d6168b4d4cdacb8b2fe9251c53bc 100644 --- a/openbis-ipad/ipad-example-data/ipad-ui/1/dss/reporting-plugins/ipad-read-service-v1/ipad_read.py +++ b/openbis-ipad/ipad-example-data/ipad-ui/1/dss/reporting-plugins/ipad-read-service-v1/ipad_read.py @@ -21,14 +21,14 @@ def add_headers(builder): CHILDREN : The permIds of the children of this entity. Transmitted as JSON. PROPERTIES : Properties (metadata) that should be displayed for this entity. Transmitted as JSON. """ - builder.addHeader("SUMMARY_HEADER") - builder.addHeader("SUMMARY") - builder.addHeader("IDENTIFIER") builder.addHeader("PERM_ID") builder.addHeader("REFCON") builder.addHeader("CATEGORY") - builder.addHeader("IMAGE_URL") + builder.addHeader("SUMMARY_HEADER") + builder.addHeader("SUMMARY") builder.addHeader("CHILDREN") + builder.addHeader("IDENTIFIER") + builder.addHeader("IMAGE_URL") builder.addHeader("PROPERTIES") def image_url_for_compound(material):