erp_forms 2.0.3 → 2.0.4

data/lib/erp_forms/dynamic_form_field.rb

@@ -161,9 +161,11 @@ class DynamicFormField
     field[:extraParams] = options[:extraParams] unless options[:extraParams].blank?
     field[:url] = options[:url] unless options[:url].blank?
     field[:fields] = options[:fields] unless options[:fields].blank?
-    
     field[:mapping] = options[:mapping] unless options[:mapping].blank?
+    field[:minLength] = options[:minLength] unless options[:minLength].nil?
     field[:maxLength] = options[:maxLength] unless options[:maxLength].nil?
+    field[:minValue] = options[:minValue] unless options[:minValue].nil?
+    field[:maxValue] = options[:maxValue] unless options[:maxValue].nil?
     
     if selections and selections != []
       field[:store] = selections
@@ -191,6 +193,7 @@ class DynamicFormField
     options[:allowBlank] = true if options[:allowBlank].nil?
     options[:value] = '' if options[:value].nil?
     options[:readOnly] = false if options[:readOnly].nil?
+    options[:minLength] = nil if options[:minLength].nil?
     options[:maxLength] = nil if options[:maxLength].nil?
     options[:width] = 200 if options[:width].nil?
     options[:height] = nil if options[:height].nil?

data/lib/erp_forms/dynamic_grid_column.rb

@@ -2,52 +2,28 @@ class DynamicGridColumn
   
   def self.build_column(field_hash, options={})
     field_hash.symbolize_keys!
-    header = field_hash[:fieldLabel]
-    type = DynamicGridColumn.convert_xtype_to_column_type(field_hash[:xtype])
+    header = (field_hash[:header] ? field_hash[:header] : field_hash[:fieldLabel])
+    type = (field_hash[:type] ? field_hash[:type] : DynamicGridColumn.convert_xtype_to_column_type(field_hash[:xtype]))
     data_index = (field_hash[:dataIndex] ? field_hash[:dataIndex] : field_hash[:name])
+    sortable = (field_hash[:sortable].nil? ? true : field_hash[:sortable])
+    renderer = (type == 'date' ? "Ext.util.Format.dateRenderer('m/d/Y')" : '')
     
-    if type == 'date'
-      renderer = "Ext.util.Format.dateRenderer('m/d/Y')"
-    else
-      renderer = ''
-    end
-    
-    col = "{
-        \"header\":\"#{header}\",
-        \"type\":\"#{type}\",
-        \"dataIndex\":\"#{data_index}\""
+    col = {
+      :header => header,
+      :type => type,
+      :dataIndex => data_index,
+      :sortable => sortable
+    }
    
-    
-    col << ",\"width\":#{field_hash[:width]}" if field_hash[:width]
+    col[:width] = field_hash[:width] if field_hash[:width]
+    col[:renderer] = renderer unless renderer.blank?
 
-    sortable = field_hash[:sortable].nil? ? true : field_hash[:sortable]
-    col << ",\"sortable\":#{sortable}"
-
-    col += ",
-        \"renderer\": #{renderer}" if renderer != ''
-
-    if options[:editor]
-      readonly = field_hash[:readOnly].blank? ? false : field_hash[:readOnly]
-      col += ",
-      {
-        \"xtype\": \"#{field_hash[:xtype]}\",
-        \"readOnly\": \"#{readonly}\""
-        
-        if field_hash[:validation_regex] and field_hash[:validation_regex] != ''
-          col += ",    
-            \"validateOnBlur\": true,
-            \"validator\": function(v){
-              var pattern = /#{field_hash[:validation_regex]}/;
-              var regex = new RegExp(pattern);
-              return regex.test(v);          
-            }"
-        end
-      col += "}"
+    if field_hash[:editor]
+      selections = (field_hash[:editor][:store] ? field_hash[:editor][:store] : [])
+      col[:editor] = DynamicFormField.basic_field(field_hash[:editor][:xtype], field_hash[:editor], selections)
     end    
-        
-    col += "}"
     
-    col
+    col.to_json
   end
   
   def self.build_delete_column(action='')

data/lib/erp_forms/version.rb

@@ -2,7 +2,7 @@ module ErpForms
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end