Pr612

extras/QPickerElement.h

@@ -11,11 +11,17 @@
 @property (nonatomic, strong) id<QPickerValueParser> valueParser;
 
 @property (nonatomic, strong) NSArray *items;
+@property (nonatomic, strong) NSArray *itemsValues;
 @property (nonatomic, readonly) NSArray *selectedIndexes;
 
+@property (nonatomic, strong) id displayValue;
+@property (nonatomic, strong) id submitValue;
+
 - (QPickerElement *)initWithTitle:(NSString *)title items:(NSArray *)items value:(id)value;
+- (QPickerElement *)initWithTitle:(NSString *)title items:(NSArray *)items itemsValues:(NSArray *) itemsValues value:(id)value;
 
 - (void)reloadAllComponents;
 - (void)reloadComponent:(NSInteger)index;
 
+
 @end

extras/QPickerElement.m

@@ -6,11 +6,13 @@ @implementation QPickerElement
 {
 @private
     NSArray *_items;
-
+    NSArray *_itemsValues;
     UIPickerView *_pickerView;
+
 }
 
 @synthesize items = _items;
+@synthesize itemsValues = _itemsValues;
 @synthesize valueParser = _valueParser;
 
 - (QPickerElement *)init
@@ -30,6 +32,15 @@ - (QPickerElement *)initWithTitle:(NSString *)title items:(NSArray *)items value
     }
     return self;
 }
+- (QPickerElement *)initWithTitle:(NSString *)title items:(NSArray *)items itemsValues:(NSArray *)itemsValues value:(id)value
+{
+    if ((self = [super initWithTitle:title Value:value])) {
+        _items = items;
+        _itemsValues = itemsValues;
+        self.valueParser = [QPickerTabDelimitedStringParser new];
+    }
+    return self;
+}
 
 - (UITableViewCell *)getCellForTableView:(QuickDialogTableView *)tableView controller:(QuickDialogController *)controller
 {
@@ -51,7 +62,7 @@ - (UITableViewCell *)getCellForTableView:(QuickDialogTableView *)tableView contr
 - (void)fetchValueIntoObject:(id)obj
 {
 	if (_key != nil) {
-        [obj setValue:_value forKey:_key];
+        [obj setValue:_submitValue forKey:_key];
     }
 }
 

extras/QPickerTableViewCell.m

@@ -110,22 +110,26 @@ - (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row f
 
 - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
 {
-    self.pickerElement.value = [self getPickerViewValue];
+    self.pickerElement.value = self.pickerElement.displayValue = [self getPickerViewValue:false];
+    self.pickerElement.submitValue = [self getPickerViewValue:true];
     [self prepareForElement:_entryElement inTableView:_quickformTableView];
     [self.pickerElement handleEditingChanged];
 }
 
 #pragma mark - Getting/setting value from UIPickerView
 
-- (id)getPickerViewValue
+- (id)getPickerViewValue:(BOOL)submitValue
 {
     NSMutableArray *componentsValues = [NSMutableArray array];
 
     for (int i = 0; i < _pickerView.numberOfComponents; i++)
     {
         NSInteger rowIndex = [_pickerView selectedRowInComponent:i];
         if (rowIndex >= 0) {
-            [componentsValues addObject:[self pickerView:_pickerView titleForRow:rowIndex forComponent:i]];
+            if (self.pickerElement.itemsValues == nil || !submitValue)
+                [componentsValues addObject:[self pickerView:_pickerView titleForRow:rowIndex forComponent:i]];
+            else
+                [componentsValues addObject:[self.pickerElement.itemsValues[i] objectAtIndex:rowIndex]];
         } else {
             [componentsValues addObject:[NSNull null]];
         }
@@ -135,14 +139,25 @@ - (id)getPickerViewValue
     return [self.pickerElement.valueParser objectFromComponentsValues:componentsValues];
 }
 
+
+
 - (void)setPickerViewValue:(id)value
 {
     NSArray *componentsValues = [self.pickerElement.valueParser componentsValuesFromObject:value];
 
     for (int componentIndex = 0; componentIndex < componentsValues.count && componentIndex < _pickerView.numberOfComponents; componentIndex++)
     {
         id componentValue = [componentsValues objectAtIndex:(NSUInteger) componentIndex];
-        NSInteger rowIndex = [[self.pickerElement.items objectAtIndex:componentIndex] indexOfObject:componentValue];
+        NSInteger rowIndex = NSNotFound;
+//        if (self.pickerElement.itemsValues == nil)
+//        {
+            rowIndex = [[self.pickerElement.items objectAtIndex:componentIndex] indexOfObject:componentValue];
+//        }
+//        else
+//        {
+//            rowIndex = [[self.pickerElement.itemsValues objectAtIndex:componentIndex] indexOfObject:componentValue];
+//        }
+
         if (rowIndex != NSNotFound) {
             [_pickerView selectRow:rowIndex inComponent:componentIndex animated:YES];
         }