Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions XLForm/XL/Controllers/XLFormViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ typedef NS_ENUM(NSUInteger, XLFormRowNavigationDirection) {
-(XLFormBaseCell *)updateFormRow:(XLFormRowDescriptor *)formRow;

-(NSDictionary *)formValues;
-(NSDictionary *)formValuesIncludingHidden;
-(NSDictionary *)httpParameters;

-(XLFormRowDescriptor *)formRowFormMultivaluedFormSection:(XLFormSectionDescriptor *)formSection;
Expand Down
5 changes: 5 additions & 0 deletions XLForm/XL/Controllers/XLFormViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,11 @@ -(NSDictionary *)formValues
return [self.form formValues];
}

-(NSDictionary *)formValuesIncludingHidden
{
return [self.form formValuesIncludingHidden];
}

-(NSDictionary *)httpParameters
{
return [self.form httpParameters:self];
Expand Down
1 change: 1 addition & 0 deletions XLForm/XL/Descriptors/XLFormDescriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ typedef NS_OPTIONS(NSUInteger, XLFormRowNavigationOptions) {
-(nullable NSIndexPath *)indexPathOfFormRow:(nonnull XLFormRowDescriptor *)formRow;

-(nonnull NSDictionary *)formValues;
-(nonnull NSDictionary *)formValuesIncludingHidden;
-(nonnull NSDictionary *)httpParameters:(nonnull XLFormViewController *)formViewController;

-(nonnull NSArray *)localValidationErrors:(nonnull XLFormViewController *)formViewController;
Expand Down
22 changes: 17 additions & 5 deletions XLForm/XL/Descriptors/XLFormDescriptor.m
Original file line number Diff line number Diff line change
Expand Up @@ -284,21 +284,33 @@ -(NSIndexPath *)globalIndexPathOfFormRow:(XLFormRowDescriptor *)formRow
return nil;
}

-(NSDictionary *)formValuesIncludingHidden
{
return [self formValuesWithHidden:YES];
}

-(NSDictionary *)formValues
{
NSMutableDictionary * result = [NSMutableDictionary dictionary];
for (XLFormSectionDescriptor * section in self.formSections) {
return [self formValuesWithHidden:NO];
}

-(NSDictionary *)formValuesWithHidden:(BOOL)includeHidden
{
NSArray* sections = includeHidden ? self.allSections : self.formSections;
NSMutableDictionary* result = [NSMutableDictionary dictionary];
for (XLFormSectionDescriptor * section in sections) {
NSArray* rows = includeHidden ? section.allRows : section.formRows;
if (section.multivaluedTag.length > 0){
NSMutableArray * multiValuedValuesArray = [NSMutableArray new];
for (XLFormRowDescriptor * row in section.formRows) {
NSMutableArray* multiValuedValuesArray = [NSMutableArray new];
for (XLFormRowDescriptor * row in rows) {
if (row.value){
[multiValuedValuesArray addObject:row.value];
}
}
[result setObject:multiValuedValuesArray forKey:section.multivaluedTag];
}
else{
for (XLFormRowDescriptor * row in section.formRows) {
for (XLFormRowDescriptor * row in rows) {
if (row.tag.length > 0){
[result setObject:(row.value ?: [NSNull null]) forKey:row.tag];
}
Expand Down