Преглед на файлове

161213
Modify
common editor edit field add min length logic

Ray Zhang преди 9 години
родител
ревизия
4f3da47377

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


+ 35 - 3
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -154,11 +154,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/CommonEditor/CommonEditorViewController.m"
-            timestampString = "503221005.414365"
+            timestampString = "503400284.648482"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "6075"
-            endingLineNumber = "6075"
+            startingLineNumber = "6122"
+            endingLineNumber = "6122"
             landmarkName = "-fill_enum_subitem:subid:source:mapping:"
             landmarkType = "7">
          </BreakpointContent>
@@ -211,5 +211,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/CommonEditor/CommonEditorViewController.m"
+            timestampString = "503400284.648482"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "562"
+            endingLineNumber = "562"
+            landmarkName = "-check_cancommit:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/CommonEditor/CommonEditorViewController.m"
+            timestampString = "503400379.727108"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "561"
+            endingLineNumber = "561"
+            landmarkName = "-check_cancommit:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 59 - 12
RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -388,7 +388,7 @@
                     if([[itemjson valueForKey:@"required"] isEqualToString: @"true"] && setvalue==false)
                     {
                         self.cancommit = false;
-                        NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,itemjson[@"aname"]];
+                        NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
                         
                         [fields addObject:mfield];
                         NSIndexPath* indexpath =[self get_indexpath1:[itemjson valueForKey:@"name"]];
@@ -422,7 +422,7 @@
                     if([[itemjson valueForKey:@"required"] isEqualToString: @"true"]&&checked.count==0)
                     {
                         self.cancommit = false;
-                        NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,itemjson[@"aname"]];
+                        NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
                         
                         [fields addObject:mfield];
                         NSIndexPath* indexpath =[self get_indexpath1:[itemjson valueForKey:@"name"]];
@@ -450,7 +450,7 @@
                     if([[itemjson valueForKey:@"required"] isEqualToString: @"true"] && [itemjson objectForKeyedSubscript:@"data"]==nil)
                     {
                         self.cancommit = false;
-                        NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,itemjson[@"aname"]];
+                        NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
                         
                         [fields addObject:mfield];
                         NSIndexPath* indexpath =[self get_indexpath1:[itemjson valueForKey:@"name"]];
@@ -469,7 +469,7 @@
                     if([[itemjson valueForKey:@"required"] isEqualToString: @"true"] && [itemjson objectForKeyedSubscript:@"value"] ==nil)
                     {
                         self.cancommit = false;
-                        NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,itemjson[@"aname"]];
+                        NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
                         
                         [fields addObject:mfield];
                         NSIndexPath* indexpath =[self get_indexpath1:[itemjson valueForKey:@"name"]];
@@ -516,7 +516,7 @@
                                 if([[modify_item valueForKey:@"required"] isEqualToString: @"true"] )
                                 {
                                     self.cancommit = false;
-                                    NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,itemjson[@"aname"]];
+                                    NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
                                     
                                     [fields addObject:mfield];
                                     NSIndexPath* indexpath =[self get_indexpath1:[modify_item valueForKey:@"name"]];
@@ -541,7 +541,7 @@
                         if([[itemjson valueForKey:@"required"] isEqualToString: @"true"] )
                         {
                             self.cancommit = false;
-                            NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,itemjson[@"aname"]];
+                            NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
                             
                             [fields addObject:mfield];
                             NSIndexPath* indexpath =[self get_indexpath1:[itemjson valueForKey:@"name"]];
@@ -555,6 +555,53 @@
                         }
                     }
                 }
+                else if([[itemjson valueForKey:@"control"] isEqualToString:@"edit"])
+                {
+                    int min_length = [[itemjson valueForKey:@"min_length"] intValue];
+                    NSString* check_len_val =itemjson[@"value"];
+                    if( check_len_val.length<min_length)
+                    {
+                        self.cancommit = false;
+                        NSString* mfield =[NSString stringWithFormat:@"%d. %@ is too short",fields.count+1,itemjson[@"aname"]];
+                        
+                        
+                        [fields addObject:mfield];
+                        
+                        
+                        NSIndexPath* indexpath =[self get_indexpath1:[itemjson valueForKey:@"name"]];
+                        if(alert)
+                            [self unhide_section:indexpath.section];
+                        if(fields.count==1)
+                        {
+                            self.first_miss_pos =  indexpath;
+                            
+                        }
+                    }
+                    else if([itemjson valueForKey:@"value"]!=nil && ![[itemjson valueForKey:@"value"]isEqualToString:@""] )
+                        [upparams setValue:[itemjson valueForKey:@"value"] forKey:[itemjson valueForKey:@"name"]];
+                    else
+                    {
+                        if([[itemjson valueForKey:@"required"] isEqualToString: @"true"] )
+                        {
+                            self.cancommit = false;
+                            NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
+                            
+                            
+                            [fields addObject:mfield];
+                            
+                            
+                            NSIndexPath* indexpath =[self get_indexpath1:[itemjson valueForKey:@"name"]];
+                            if(alert)
+                                [self unhide_section:indexpath.section];
+                            if(fields.count==1)
+                            {
+                                self.first_miss_pos =  indexpath;
+                                
+                            }
+                        }
+                    }
+                }
+            
                 else
                 {
                     if([itemjson valueForKey:@"value"]!=nil && ![[itemjson valueForKey:@"value"]isEqualToString:@""])
@@ -564,7 +611,7 @@
                         if([[itemjson valueForKey:@"required"] isEqualToString: @"true"] )
                         {
                             self.cancommit = false;
-                            NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,itemjson[@"aname"]];
+                            NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
                             
                             
                             [fields addObject:mfield];
@@ -1026,7 +1073,7 @@
                                 self.cancommit = false;
                                 
                                 
-                                NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,addjson[@"aname"]];
+                                NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,addjson[@"aname"]];
                                 
                                 [fields addObject:mfield];
                                 
@@ -1057,7 +1104,7 @@
                         if([required isEqualToString: @"true"] && action_data==nil)
                         {
                             self.cancommit = false;
-                            NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,addjson[@"aname"]];
+                            NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,addjson[@"aname"]];
                             
                             [fields addObject:mfield];
                             
@@ -1109,7 +1156,7 @@
                                         if([[itemjson valueForKey:@"required"] isEqualToString: @"true"] && setvalue==false)
                                         {
                                             self.cancommit = false;
-                                            NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,itemjson[@"aname"]];
+                                            NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
                                             
                                             [fields addObject:mfield];
                                             
@@ -1143,7 +1190,7 @@
                                         if([[itemjson valueForKey:@"required"] isEqualToString: @"true"] )
                                         {
                                             self.cancommit = false;
-                                            NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,itemjson[@"aname"]];
+                                            NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,itemjson[@"aname"]];
                                             
                                             [fields addObject:mfield];
                                             
@@ -1178,7 +1225,7 @@
                             if([[addjson valueForKey:@"required"] isEqualToString: @"true"] )
                             {
                                 self.cancommit = false;
-                                NSString* mfield =[NSString stringWithFormat:@"%d. %@",fields.count+1,addjson[@"aname"]];
+                                NSString* mfield =[NSString stringWithFormat:@"%d. %@ is missing",fields.count+1,addjson[@"aname"]];
                                 
                                 [fields addObject:mfield];