datatablesnet 1.1 → 1.1.1

data/lib/datatablesnet/datatable.rb

@@ -105,6 +105,8 @@ module Datatable
       end
     end
 
+    table_options["fnInfoCallback"] = NoEscape.new(options[:info_callback]) if options[:info_callback].present?
+
     table_options["aoColumns"] = datatable_get_column_defs(options,columns)
 
     config = {:options => options, :columns =>columns, :table_options => table_options}
@@ -216,11 +218,11 @@ module Datatable
         if key =~ /.*_to/
           field_name = key[6..-4]
           search_by[field_name] = {} unless search_by[field_name].present?
-          search_by[field_name][:to] = Date.parse(value)
+          search_by[field_name][:to] = convert_string(value)
         elsif key =~ /.*_from/
           field_name = key[6..-6]
           search_by[field_name] = {} unless search_by[field_name].present?
-          search_by[field_name][:from] = Date.parse(value)
+          search_by[field_name][:from] = convert_string(value)
         else
           search_by[key[6..-1]] = value
         end
@@ -240,32 +242,29 @@ module Datatable
     grid_options
   end
 
+  def convert_string value
+    begin
+      value = Date.parse(value)
+    rescue ArgumentError
+      value = value.to_i
+      if value == 0
+        value = value
+      end
+    end
+    value
+  end
 
-  def find(klass, params={}, options = {})
-    puts params.to_json
-    field_filter_where = {}
-    all_filter_where = {}
-    search_filter_where = {}
 
+  def build_condition(klass, params={}, options = {})
     grid_options = parse_params params
+    build_condition_internal(klass, grid_options, options[:conditions].present? ? options[:conditions] : nil)
+  end
 
+  def build_condition_internal(klass, grid_options, conditions)
+    field_filter_where = {}
+    all_filter_where = {}
+    search_filter_where = {}
 
-    options[:page] = grid_options[:page]
-    options[:per_page] = grid_options[:per_page]
-
-    # Build order by
-    grid_options[:order_by].each do |column, order|
-      if column
-        if options[:order].present?
-          options[:order] << ", "
-        else
-          options[:order] = ""
-        end
-        options[:order] << "#{column} #{order}"
-      end
-    end
-
-    # Build filter by
     grid_options[:filter_by].each do |column, value|
       field_filter_where[column] = value
     end
@@ -279,9 +278,14 @@ module Datatable
       end
     end
 
+    #process search_by
     grid_options[:search_by].each do |column, value|
       if value.instance_of?(Hash)
-        search_filter_where[column] = (value[:from]..value[:to])
+        if value[:to].present?
+          search_filter_where[column] = (value[:from]..value[:to])
+        else
+          search_filter_where[column] = value[:from]
+        end
       else
         search_filter_where[column] = value
       end
@@ -289,13 +293,47 @@ module Datatable
 
     if !field_filter_where.empty? or !all_filter_where.empty? or !search_filter_where.empty?
       sql_where = [field_filter_where.sql_like, all_filter_where.sql_or.sql_like, search_filter_where.sql_and].sql_and.sql_where
-      if options[:conditions].present?
-        options[:conditions] << " and (" << sql_where << ")"
+      if conditions
+        if conditions.instance_of?(Array)
+          condition_string = conditions[0]
+          condition_params = conditions[1..-1]
+        else
+          condition_string = conditions
+          condition_params = []
+        end
+        condition_string << " and (" << sql_where[0] << ")"
+        condition_params += sql_where[1..-1]
+        conditions = [condition_string] + condition_params
       else
-        options[:conditions] = sql_where
+        conditions = sql_where
+      end
+    end
+    conditions
+  end
+
+  def find(klass, params={}, options = {})
+    puts params.to_json
+
+    grid_options = parse_params params
+
+    options[:page] = grid_options[:page]
+    options[:per_page] = grid_options[:per_page]
+
+    # Build order by
+    grid_options[:order_by].each do |column, order|
+      if column
+        if options[:order].present?
+          options[:order] << ", "
+        else
+          options[:order] = ""
+        end
+        options[:order] << "#{column} #{order}"
       end
     end
 
+    # Build filter by
+    options[:conditions] = build_condition_internal(klass, grid_options, options[:conditions].present? ? options[:conditions] : nil)
+
     puts options[:conditions]
 
     rows = klass.paginate options
@@ -314,7 +352,7 @@ module Datatable
 
     total_records = klass.count
     if options[:conditions].present?
-      klass.count(:conditions => options[:conditions])
+      total_display_records = klass.count(:conditions => options[:conditions])
     else
       total_display_records = total_records
     end

data/lib/datatablesnet/hash_sql.rb

@@ -51,7 +51,7 @@ module HashSql
             values << value.max
           elsif self.sql_comparator = "like"
             where_string <<  "#{name} LIKE ?"
-            values << '%' + value + '%'
+            values << '%' + value.to_s + '%'
           else
             where_string <<  "#{name} = ?"
             values << value

data/lib/datatablesnet/version.rb

@@ -1,3 +1,3 @@
 module Datatablesnet
-  VERSION = "1.1"
+  VERSION = "1.1.1"
 end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  version: "1.1"
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Matt Fields
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 +03:00
+date: 2011-08-24 00:00:00 +03:00
 default_executable: 
 dependencies: []