Renamed group to category in the PE

SVN: 27202

openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h

@@ -36,7 +36,7 @@
 @property (nonatomic, retain) NSString * identifier;
 @property (nonatomic, retain) NSString * permId;
 @property (nonatomic, retain) NSString * refcon;
-@property (nonatomic, retain) NSString * group;
+@property (nonatomic, retain) NSString * category;
 @property (nonatomic, retain) NSString * imageUrl;
 
 @property (nonatomic, retain) NSString * childrenPermIdsJson;

openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m

@@ -32,7 +32,7 @@
 @dynamic identifier;
 @dynamic permId;
 @dynamic refcon;
-@dynamic group;
+@dynamic category;
 @dynamic imageUrl;
 @dynamic childrenPermIdsJson;
 @dynamic propertiesJson;
@@ -90,7 +90,7 @@
     self.identifier = rawEntity.identifier;
     self.permId = rawEntity.permId;
     self.refcon = rawEntity.refcon;
-    self.group = rawEntity.category;
+    self.category = rawEntity.category;
     self.imageUrl = rawEntity.imageUrl;
     self.childrenPermIdsJson = rawEntity.children;
     self.propertiesJson = rawEntity.properties;

openbis-ipad/BisKit/Classes/persistent-data-model.xcdatamodeld/persistent-data-model.xcdatamodel/contents

 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="1811" systemVersion="11G56" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
     <entity name="CISDOBIpadEntity" representedClassName="CISDOBIpadEntity" syncable="YES">
+        <attribute name="category" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="childrenPermIds" optional="YES" transient="YES" syncable="YES"/>
         <attribute name="childrenPermIdsJson" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
-        <attribute name="group" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="identifier" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="imageUrl" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="permId" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
@@ -16,6 +16,6 @@
     <fetchRequest name="EntitiesByPermIds" entity="CISDOBIpadEntity" predicateString="permId IN $PERM_IDS" fetchBatchSize="20"/>
     <fetchRequest name="EntityAndChildren" entity="CISDOBIpadEntity" predicateString="SELF == $ENTITY OR permId IN $CHILDREN" fetchBatchSize="20"/>
     <elements>
-        <element name="CISDOBIpadEntity" positionX="160" positionY="192" width="128" height="210"/>
+        <element name="CISDOBIpadEntity" positionX="0" positionY="0" width="0" height="0"/>
     </elements>
 </model>
\ No newline at end of file

openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m

@@ -65,7 +65,7 @@
     NSArray *objects = [sectionInfo objects];
     if ([objects count] < 1) return @"";
     
-    return ((CISDOBIpadEntity *)[objects objectAtIndex: 0]).group;
+    return ((CISDOBIpadEntity *)[objects objectAtIndex: 0]).category;
 }
 
 - (CISDOBIpadEntity *)objectAtIndexPath:(NSIndexPath *)indexPath
@@ -151,12 +151,12 @@
     [fetchRequest setEntity:entity];
     [fetchRequest setFetchBatchSize:20];
     
-    NSSortDescriptor *groupSortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"group" ascending: NO];
+    NSSortDescriptor *categorySortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"category" ascending: NO];
     NSSortDescriptor *summaryHeaderSortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"summaryHeader" ascending: YES];
-    NSArray *sortDescriptors = @[groupSortDescriptor, summaryHeaderSortDescriptor];
+    NSArray *sortDescriptors = @[categorySortDescriptor, summaryHeaderSortDescriptor];
     [fetchRequest setSortDescriptors:sortDescriptors];
     
-    NSFetchedResultsController *aFetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest: fetchRequest managedObjectContext: self.managedObjectContext sectionNameKeyPath: @"group" cacheName: @"Root"];
+    NSFetchedResultsController *aFetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest: fetchRequest managedObjectContext: self.managedObjectContext sectionNameKeyPath: @"category" cacheName: @"Root"];
     aFetchedResultsController.delegate = self;
     self.fetchedResultsController = aFetchedResultsController;
     
@@ -180,12 +180,12 @@
             nil];
     NSFetchRequest *fetchRequest = [model fetchRequestFromTemplateWithName: @"EntityAndChildren" substitutionVariables: fetchVariables];
     
-    NSSortDescriptor *groupSortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"group" ascending: NO];
+    NSSortDescriptor *categorySortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"category" ascending: NO];
     NSSortDescriptor *summaryHeaderSortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"summaryHeader" ascending: YES];
-    NSArray *sortDescriptors = @[groupSortDescriptor, summaryHeaderSortDescriptor];
+    NSArray *sortDescriptors = @[categorySortDescriptor, summaryHeaderSortDescriptor];
     [fetchRequest setSortDescriptors:sortDescriptors];
     
-    NSFetchedResultsController *aFetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest: fetchRequest managedObjectContext: self.managedObjectContext sectionNameKeyPath: @"group" cacheName: _parentModel.selectedObject.permId];
+    NSFetchedResultsController *aFetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest: fetchRequest managedObjectContext: self.managedObjectContext sectionNameKeyPath: @"category" cacheName: _parentModel.selectedObject.permId];
     aFetchedResultsController.delegate = self;
     self.fetchedResultsController = aFetchedResultsController;