|
|
@@ -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];
|
|
|
|