Просмотр исходного кода

160920
Add: update modify_time trigger on offline_order, offline_contact, offline_cart, wishlist;

Ray Zhang 9 лет назад
Родитель
Сommit
104a7af039

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 17 - 1
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -534,7 +534,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
@@ -1075,5 +1075,21 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/sidemenu/LoginViewController.m"
+            timestampString = "496054558.354193"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "299"
+            endingLineNumber = "299"
+            landmarkName = "-onLoginClick:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 1 - 1
RedAnt ERP Mobile/common/Functions/sidemenu/LoginViewController.m

@@ -296,7 +296,7 @@
                     
                     
                     
-                    if(offline_dirty)
+                    if(offline_dirty&& !appDelegate.offline_mode)
                     {
                         
                         UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Detected new offline data" message:@"Do you want to sync with server?" preferredStyle:UIAlertControllerStyleAlert];

+ 4 - 4
RedAnt ERP Mobile/common/data_provider/iSalesDB.m

@@ -721,17 +721,17 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
     
     NSString* create_offline_salesrep=@"CREATE TABLE IF NOT EXISTS offline_salesrep ( _id INTEGER PRIMARY KEY, name text, code text,salesrep_id integer);";
     
-    NSString* create_order_trigger=@"CREATE TRIGGER  if not exists offline_order_insert after insert on offline_order BEGIN select offline_dirty();  END;drop trigger if exists offline_order_update; CREATE TRIGGER  if not exists offline_order_update after update on offline_order BEGIN select offline_dirty();  UPDATE offline_order SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;END;CREATE TRIGGER  if not exists offline_order_delete after delete on offline_order BEGIN select offline_dirty();  END;";
+    NSString* create_order_trigger=@"drop trigger if exists offline_order_insert;CREATE TRIGGER  if not exists offline_order_insert after insert on offline_order BEGIN select offline_dirty();  UPDATE offline_order SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;END;drop trigger if exists offline_order_update; CREATE TRIGGER  if not exists offline_order_update after update on offline_order BEGIN select offline_dirty();  UPDATE offline_order SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;END;CREATE TRIGGER  if not exists offline_order_delete after delete on offline_order BEGIN select offline_dirty();  END;";
  
     
     
-    NSString* create_contact_trigger=@"CREATE TRIGGER  if not exists offline_contact_insert after insert on offline_contact BEGIN select offline_dirty();  END;drop trigger if exists offline_contact_update; CREATE TRIGGER  if not exists offline_contact_update after update on offline_contact BEGIN select offline_dirty(); UPDATE offline_contact SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;  END;CREATE TRIGGER  if not exists offline_contact_delete after delete on offline_contact BEGIN select offline_dirty();  END;";
+    NSString* create_contact_trigger=@"drop trigger if exists offline_contact_insert;CREATE TRIGGER  if not exists offline_contact_insert after insert on offline_contact BEGIN select offline_dirty();  UPDATE offline_contact SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;END;drop trigger if exists offline_contact_update; CREATE TRIGGER  if not exists offline_contact_update after update on offline_contact BEGIN select offline_dirty(); UPDATE offline_contact SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;  END;CREATE TRIGGER  if not exists offline_contact_delete after delete on offline_contact BEGIN select offline_dirty();  END;";
 
     
-    NSString* create_cart_trigger=@"CREATE TRIGGER  if not exists offline_cart_insert after insert on offline_cart BEGIN select offline_dirty();  END;drop trigger if exists offline_cart_update; CREATE TRIGGER  if not exists offline_cart_update after update on offline_cart BEGIN select offline_dirty(); UPDATE offline_cart SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;  END;CREATE TRIGGER  if not exists offline_cart_delete after delete on offline_cart BEGIN select offline_dirty();  END;";
+    NSString* create_cart_trigger=@"drop trigger if exists offline_cart_insert;CREATE TRIGGER  if not exists offline_cart_insert after insert on offline_cart BEGIN select offline_dirty(); UPDATE offline_cart SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;  END;drop trigger if exists offline_cart_update; CREATE TRIGGER  if not exists offline_cart_update after update on offline_cart BEGIN select offline_dirty(); UPDATE offline_cart SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;  END;CREATE TRIGGER  if not exists offline_cart_delete after delete on offline_cart BEGIN select offline_dirty();  END;";
     
     
-    NSString* create_wishlist_trigger=@"CREATE TRIGGER  if not exists wishlist_insert after insert on wishlist BEGIN select offline_dirty();  END;drop trigger if exists wishlist_update;CREATE TRIGGER  if not exists wishlist_update after update on wishlist BEGIN select offline_dirty();  UPDATE wishlist_insert SET modify_time= datetime('now', 'localtime') WHERE _id=new._id; END;CREATE TRIGGER  if not exists wishlist_delete after delete on wishlist BEGIN select offline_dirty();  END;";
+    NSString* create_wishlist_trigger=@"drop trigger if exists wishlist_insert;CREATE TRIGGER  if not exists wishlist_insert after insert on wishlist BEGIN select offline_dirty();  UPDATE wishlist_insert SET modify_time= datetime('now', 'localtime') WHERE _id=new._id;END;drop trigger if exists wishlist_update;CREATE TRIGGER  if not exists wishlist_update after update on wishlist BEGIN select offline_dirty();  UPDATE wishlist_insert SET modify_time= datetime('now', 'localtime') WHERE _id=new._id; END;CREATE TRIGGER  if not exists wishlist_delete after delete on wishlist BEGIN select offline_dirty();  END;";
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     
     //if(appDelegate.offline_mode)