Merge branch 'master' of github.com:ixc-software/snow

ixc-software · Mar 3, 2012 · 0433e9a · 0433e9a
2 parents 371a95e + 53e6649
commit 0433e9a
Show file tree

Hide file tree

Showing 16 changed files with 746 additions and 287 deletions.
diff --git a/ClassesForAllPlatforms/ClientController.h b/ClassesForAllPlatforms/ClientController.h
@@ -51,7 +51,9 @@
 -(NSString *)localStatusForObjectsWithRootGuid:(NSString *)rootObjectGUID;
 -(void) finalSave:(NSManagedObjectContext *)mocForSave; 
 -(BOOL) checkIfCurrentAdminCanLogin;
--(void) updateLocalGraphFromSnowEnterpriseServerWithDateFrom:(NSDate *)dateFrom withDateTo:(NSDate *)dateTo;
+-(void) updateLocalGraphFromSnowEnterpriseServerWithDateFrom:(NSDate *)dateFrom 
+                                                  withDateTo:(NSDate *)dateTo
+                               withIncludeCarrierSubentities:(BOOL)isIncludeCarrierSubentities;
 
 -(NSArray *)getAllObjectsListWithEntityForList:(NSString *)entityForList 
                             withMainObjectGUID:(NSString *)mainObjectGUID 
@@ -67,4 +69,10 @@
                          withAdmin:(CompanyStuff *)admin 
                     withRootObject:(NSManagedObject *)rootObject
              isEveryTenPercentSave:(BOOL)isEveryTenPercentSave;
+
+-(void) updateLocalGraphFromSnowEnterpriseServerForCarrierID:(NSManagedObjectID *)carrierID
+                                                withDateFrom:(NSDate *)dateFrom 
+                                                  withDateTo:(NSDate *)dateTo
+                                                   withAdmin:(CompanyStuff *)admin;
+
 @end
diff --git a/ClassesForAllPlatforms/ClientController.m b/ClassesForAllPlatforms/ClientController.m
diff --git a/Model/snow.xcdatamodeld/snow000000.xcdatamodel/contents b/Model/snow.xcdatamodeld/snow000000.xcdatamodel/contents
@@ -47,7 +47,7 @@
         <attribute name="creationDate" optional="YES" attributeType="Date" syncable="YES"/>
         <attribute name="enabled" optional="YES" attributeType="Boolean" defaultValueString="YES" syncable="YES"/>
         <attribute name="externalChangedDate" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="GUID" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="GUID" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="internalChangedDate" optional="YES" attributeType="Date" syncable="YES"/>
         <attribute name="modificationDate" optional="YES" attributeType="Date" syncable="YES"/>
         <attribute name="originalCode" optional="YES" attributeType="Integer 64" indexed="YES" syncable="YES"/>
@@ -230,10 +230,10 @@
     </entity>
     <entity name="DestinationsListForSale" representedClassName="DestinationsListForSale" syncable="YES">
         <attribute name="changeDate" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="country" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="country" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="creationDate" optional="YES" attributeType="Date" syncable="YES"/>
         <attribute name="enabled" optional="YES" attributeType="Boolean" defaultValueString="YES" syncable="YES"/>
-        <attribute name="GUID" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="GUID" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="ipAddressesList" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="lastUsedACD" optional="YES" attributeType="Float" defaultValueString="0" syncable="YES"/>
         <attribute name="lastUsedASR" optional="YES" attributeType="Float" defaultValueString="0" syncable="YES"/>
@@ -248,7 +248,7 @@
         <attribute name="rate" optional="YES" attributeType="Float" defaultValueString="0" syncable="YES"/>
         <attribute name="rateSheet" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="rateSheetID" optional="YES" attributeType="String" defaultValueString="0" syncable="YES"/>
-        <attribute name="specific" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="specific" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <relationship name="carrier" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="Carrier" inverseName="destinationsListForSale" inverseEntity="Carrier" indexed="YES" syncable="YES"/>
         <relationship name="codesvsDestinationsList" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="CodesvsDestinationsList" inverseName="destinationsListForSale" inverseEntity="CodesvsDestinationsList" indexed="YES" syncable="YES"/>
         <relationship name="destinationDiscussion" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="DestinationDiscussion" inverseName="destinationsListForSale" inverseEntity="DestinationDiscussion" indexed="YES" syncable="YES"/>
@@ -297,10 +297,10 @@
     </entity>
     <entity name="DestinationsListWeBuy" representedClassName="DestinationsListWeBuy" syncable="YES">
         <attribute name="changeDate" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="country" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="country" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="creationDate" optional="YES" attributeType="Date" syncable="YES"/>
         <attribute name="enabled" optional="YES" attributeType="Boolean" defaultValueString="YES" syncable="YES"/>
-        <attribute name="GUID" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="GUID" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="ipAddressesList" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="lastUsedACD" optional="YES" attributeType="Float" defaultValueString="0" syncable="YES"/>
         <attribute name="lastUsedASR" optional="YES" attributeType="Float" defaultValueString="0" syncable="YES"/>
@@ -311,12 +311,12 @@
         <attribute name="lastUsedProfit" optional="YES" attributeType="Double" defaultValueString="0" syncable="YES"/>
         <attribute name="modificationDate" optional="YES" attributeType="Date" syncable="YES"/>
         <attribute name="postInSalesChat" optional="YES" attributeType="Boolean" syncable="YES"/>
-        <attribute name="prefix" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="prefix" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="rate" optional="YES" attributeType="Float" defaultValueString="0" syncable="YES"/>
         <attribute name="rateSheet" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="rateSheetID" optional="YES" attributeType="String" defaultValueString="0" syncable="YES"/>
         <attribute name="selectionTestingResult" optional="YES" attributeType="Integer 16" valueTransformerName="ArrayToDataTransformer" defaultValueString="0" syncable="YES"/>
-        <attribute name="specific" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="specific" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="testingRestultInfo" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="testingResult" optional="YES" attributeType="Transformable" valueTransformerName="ArrayToDataTransformer" syncable="YES"/>
         <relationship name="carrier" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="Carrier" inverseName="destinationsListWeBuy" inverseEntity="Carrier" indexed="YES" syncable="YES"/>