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 0e4f2705c1986f99e5d1d53145d3a142e679ee6e..1bcc666816ae6af57b1d591ba349ca8a49c4173b 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/Research/openBISData.sqlite b/openbis-ipad/openBIS/Research/openBISData.sqlite
index ea1c2e8f480358ebdfbb38a4cb378128f8da0a24..aa1b072b11ea0845d446cf70198347b6c65b3e57 100644
Binary files a/openbis-ipad/openBIS/Research/openBISData.sqlite and b/openbis-ipad/openBIS/Research/openBISData.sqlite differ
diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj b/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj
index 0cacd2d88bcaecb1b48c130f6b768f526000c837..5bab6c6d490a37b0c81009f477c0cbd7c008cd79 100644
--- a/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj
+++ b/openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj
@@ -34,18 +34,17 @@
36F71EE7161C453D00C87277 /* CISDOBIpadService.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED2161C453D00C87277 /* CISDOBIpadService.m */; };
36F71EE8161C453D00C87277 /* CISDOBJsonRpcCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED4161C453D00C87277 /* CISDOBJsonRpcCall.m */; };
36F71EE9161C453D00C87277 /* persistent-data-model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED6161C453D00C87277 /* persistent-data-model.xcdatamodeld */; };
- 36F71EEA161C453D00C87277 /* readme.md in Resources */ = {isa = PBXBuildFile; fileRef = 36F71ED8161C453D00C87277 /* readme.md */; };
36F71F16161C4AA000C87277 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 36F71E7E161C3AE900C87277 /* CoreData.framework */; };
36F71F17161C4AA000C87277 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 36F71E7A161C3AE900C87277 /* Foundation.framework */; };
36F71F1A161C4AA000C87277 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71F19161C4AA000C87277 /* main.m */; };
36F71F21161C4AA000C87277 /* openBISData.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 36F71F20161C4AA000C87277 /* openBISData.1 */; };
- 36F71F26161C4AE900C87277 /* readme.md in Resources */ = {isa = PBXBuildFile; fileRef = 36F71F25161C4AE900C87277 /* readme.md */; };
36F71F28161C4F0400C87277 /* CISDOBAsyncCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ECC161C453D00C87277 /* CISDOBAsyncCall.m */; };
36F71F2A161C4F0400C87277 /* CISDOBConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ECE161C453D00C87277 /* CISDOBConnection.m */; };
36F71F2C161C4F0400C87277 /* CISDOBIpadEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED0161C453D00C87277 /* CISDOBIpadEntity.m */; };
36F71F2E161C4F0400C87277 /* CISDOBIpadService.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED2161C453D00C87277 /* CISDOBIpadService.m */; };
36F71F30161C4F0400C87277 /* CISDOBJsonRpcCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED4161C453D00C87277 /* CISDOBJsonRpcCall.m */; };
36F71F32161C4F0400C87277 /* persistent-data-model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 36F71ED6161C453D00C87277 /* persistent-data-model.xcdatamodeld */; };
+ 36F71F34161C631700C87277 /* openBISData.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = 36F71F33161C631700C87277 /* openBISData.sqlite */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -117,6 +116,7 @@
36F71F1C161C4AA000C87277 /* openBISData-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "openBISData-Prefix.pch"; sourceTree = "<group>"; };
36F71F20161C4AA000C87277 /* openBISData.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = openBISData.1; sourceTree = "<group>"; };
36F71F25161C4AE900C87277 /* readme.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = readme.md; sourceTree = "<group>"; };
+ 36F71F33161C631700C87277 /* openBISData.sqlite */ = {isa = PBXFileReference; lastKnownFileType = file; name = openBISData.sqlite; path = Research/openBISData.sqlite; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -289,6 +289,7 @@
36F71F1B161C4AA000C87277 /* Supporting Files */ = {
isa = PBXGroup;
children = (
+ 36F71F33161C631700C87277 /* openBISData.sqlite */,
36F71F1C161C4AA000C87277 /* openBISData-Prefix.pch */,
);
name = "Supporting Files";
@@ -390,8 +391,7 @@
36F71E91161C3AE900C87277 /* Default-568h@2x.png in Resources */,
36F71E94161C3AE900C87277 /* MainStoryboard_iPhone.storyboard in Resources */,
36F71E97161C3AE900C87277 /* MainStoryboard_iPad.storyboard in Resources */,
- 36F71EEA161C453D00C87277 /* readme.md in Resources */,
- 36F71F26161C4AE900C87277 /* readme.md in Resources */,
+ 36F71F34161C631700C87277 /* openBISData.sqlite in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
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 518e59105b1213da3642ecd1e85f394633c6f6aa..21d01c3d3fc3836bfa985a3e99fc57adecd74d4d 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.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
index 05301bc253830381195ba116901612a8e115bfa7..3a417bc7f9bf561dd88b40a8bc9e3809b2b45755 100644
--- a/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
+++ b/openbis-ipad/openBIS/openBIS.xcodeproj/xcuserdata/cramakri.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -2,4 +2,32 @@
<Bucket
type = "1"
version = "1.0">
+ <FileBreakpoints>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "openBIS/CISDOBMasterViewController.m"
+ timestampString = "370959734.154078"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "89"
+ endingLineNumber = "89"
+ landmarkName = "-tableView:numberOfRowsInSection:"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "openBIS/CISDOBMasterViewController.m"
+ timestampString = "370959736.584476"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "95"
+ endingLineNumber = "95"
+ landmarkName = "-tableView:cellForRowAtIndexPath:"
+ landmarkType = "5">
+ </FileBreakpoint>
+ </FileBreakpoints>
</Bucket>
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m b/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
index 42e2c32c105cae52cc43a03785db105b4bc0386a..19270efedece3e2cff78184171cbc7d49d636594 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
@@ -117,7 +117,7 @@
if (_managedObjectModel != nil) {
return _managedObjectModel;
}
- NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"openBIS" withExtension:@"momd"];
+ NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"persistent-data-model" withExtension:@"momd"];
_managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
return _managedObjectModel;
}
@@ -130,7 +130,8 @@
return _persistentStoreCoordinator;
}
- NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"openBIS.sqlite"];
+// NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"openBISData.sqlite"];
+ NSURL *storeURL = [[NSBundle mainBundle] URLForResource: @"openBISData" withExtension: @"sqlite"];
NSError *error = nil;
_persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]];
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m
index b47a6f3bc5d8fd04d5a62e0c5465d174b8cb4918..c549a8baa55be6a931e2baf5b6badc4deb2dfa9e 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m
@@ -51,7 +51,7 @@
// Update the user interface for the detail item.
if (self.detailItem) {
- self.detailDescriptionLabel.text = [[self.detailItem valueForKey:@"timeStamp"] description];
+ self.detailDescriptionLabel.text = [[self.detailItem valueForKey:@"summaryHeader"] description];
}
}
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m
index 994a23bf1a7ba176a34371e95c4ea0a267ada04c..0641a3c449bba17454524df9685f8921d48f28bd 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m
@@ -151,15 +151,14 @@
}
NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
- // Edit the entity name as appropriate.
- NSEntityDescription *entity = [NSEntityDescription entityForName:@"Event" inManagedObjectContext:self.managedObjectContext];
+ NSEntityDescription *entity = [NSEntityDescription entityForName:@"CISDOBIpadEntity" inManagedObjectContext:self.managedObjectContext];
[fetchRequest setEntity:entity];
// Set the batch size to a suitable number.
[fetchRequest setFetchBatchSize:20];
// Edit the sort key as appropriate.
- NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"timeStamp" ascending:NO];
+ NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"summaryHeader" ascending:NO];
NSArray *sortDescriptors = @[sortDescriptor];
[fetchRequest setSortDescriptors:sortDescriptors];
@@ -244,7 +243,7 @@
- (void)configureCell:(UITableViewCell *)cell atIndexPath:(NSIndexPath *)indexPath
{
NSManagedObject *object = [self.fetchedResultsController objectAtIndexPath:indexPath];
- cell.textLabel.text = [[object valueForKey:@"timeStamp"] description];
+ cell.textLabel.text = [[object valueForKey:@"summaryHeader"] description];
}
@end