data_tables 0.1.23 → 0.1.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODFjZTAyOTgzODYzYzQ5NjYxNjI3ODZiOGQwZGMyNzE2YjdkYzE2OA==
+    OWY2OTVjMzE3YWVhYTEzM2NmYzIwYzBmNDQ1NTMxNGM4NDQyNjdlZQ==
   data.tar.gz: !binary |-
-    ZTllNGZhODVmYzYzOTQ0ZmFkMDI5ODFmNTFhMTgzZmJlYjI5NjQzYg==
+    M2ZhZGEyYzJkNjNlOGUzMTNmNGYzMjJjNTIxMTg5OTRkOTVmNDc4YQ==
 SHA512:
   metadata.gz: !binary |-
-    OTBmODI3ZmZmYmZhY2I1Y2M4YTQ1ZjhiZGQxYTkxNGY2OTZiYWI4YTk5ZTMx
-    YTA1ZjE5OTMxNmIzNWM0NDViNWRiNmFmNDRjZDJhNDBiNGIwYmY3ZmI3NWE1
-    YjRlMGEzZGI5MGViYzY4MzAwMjhlZTg5MzNiYmUwMDM1NWZiMDI=
+    ZDhmMTgyNjQxOWM1MzA5NzE2OWVmOWJkMmRkOTFjOTA5MzIwZTE4ZTA3MTIx
+    NGM5ZTA2ZjYyZGQ4MzZiODQ1NjQ1MTIxZjI2YjA3ZDBhNDgwYmNmMTczMzI4
+    OTNjZTllNDFmNmE1ZTcyNjExYThjZmRkYTlhMGJhMjQxYWVkZjg=
   data.tar.gz: !binary |-
-    MmVhYWE4NjYxMDliNjg1NDgxYjFmNzI1ODNlOTgwZmJjYzYwZDFmNjA0N2Zh
-    YmVkNzA0ODUwMzAzMjg2NmI2Yzc2ZTc0ZThhNzBkZjMzODEwNzE3Yjc4MTRj
-    ODliOGM4MzQwMGExYjBlYjY1NWM1OTU3NGNlYTNhNTg3ZGIyM2Y=
+    NjZlYjgzMGUwYTIwZTg4MmMyMjU5NjRlN2RlMDA5ZGMyOTdhMmY2NjI2Y2Rl
+    ZGE5ZmZjZTIxODVmZGEyYmUyZWE1NTdjYWUzZTc3ZDhiNjczNzYyYzBmNjM5
+    M2E4NGVjYWQ0N2UxMWUxMjViNzUwNTNkYTVmY2I5ZTI2ZWIzZmQ=

data/data_tables.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'data_tables'
-  s.version     = '0.1.23'
+  s.version     = '0.1.24'
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.summary     = "Rails friendly interface into DataTables"
   s.description = "DataTables for Rails"

data/lib/data_tables/data_tables_helper.rb

@@ -25,11 +25,17 @@ module DataTablesHelper
 
     options[:fnServerData] ||= "function ( sSource, aoData, fnCallback ) {
       var init_sSearch = $('#init_sSearch');
+      var start_time = $('#start_time');
+      var end_time = $('#end_time');
       if(init_sSearch != undefined && init_sSearch.val() != '' && init_sSearch.size() != 0) {
         $('.dataTables_filter input').val(init_sSearch.val());
         aoData.push( { name:'sSearch', value: init_sSearch.val() });
         $('#init_sSearch').remove();
       }
+      if(start_time.val() != undefined && start_time.val() != '' && end_time.val() != undefined && end_time.val() != '') {
+        aoData.push( { name:'sStarttime', value:start_time.val() });
+        aoData.push( { name:'sEndtime', value:end_time.val() });
+      }
       $.ajax( {
                 'dataType': 'json',
                 'url': sSource,
@@ -83,13 +89,22 @@ module DataTablesHelper
 <script>
 $(document).ready(function() {
   var oTable = $('##{datatable[:action]}').dataTable({
-#{datatables_option_string(options)}
+    #{datatables_option_string(options)}
   });
   $('tfoot input').keyup( function () {
-                /* Filter on the column (the index) of this element */
-                oTable.fnFilter( this.value, $('tfoot input').index(this) );
-        } );
-
+    /* Filter on the column (the index) of this element */
+    oTable.fnFilter( this.value, $('tfoot input').index(this) );
+   });
+  $('#custom_interval_select_log').click( function () {
+    custom_interval_select_handler_log($('#custom_start').val(),$('#custom_end').val());
+    oTable.fnDraw();
+  });
+  $('.interval').change( function () {
+    interval_click_handler_log();
+    oTable.fnDraw();
+  });
+  $('.dataTables_filter').after($('#tab_options_popup'));
+  $('.dataTables_filter').after($('#interval_choice'));
 });
 
   function change_scrollY() {

data/lib/data_tables.rb

@@ -194,6 +194,8 @@ module DataTablesController
             objects =  []
 
             condstr = nil
+            starttime_str = nil
+            endtime_str = nil
             unless params[:sSearch].blank?
               sort_column_id = params[:iSortCol_0].to_i
               sort_column = columns[sort_column_id]
@@ -201,7 +203,15 @@ module DataTablesController
                 condstr = params[:sSearch].gsub(/_/, '\\\\_').gsub(/%/, '\\\\%')
               end
             end
-
+            unless params[:sStarttime].blank? || params[:sEndtime].blank?
+              sort_column_id = params[:iSortCol_0].to_i
+              sort_column = columns[sort_column_id]
+              if sort_column && sort_column.has_key?(:attribute)
+                starttime = params[:sStarttime]
+                endtime = params[:sEndtime]
+              end
+            end
+            
             sort_column = params[:iSortCol_0].to_i
             current_page = (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i rescue 0)+1
             per_page = params[:iDisplayLength] || 10
@@ -213,7 +223,7 @@ module DataTablesController
                 query do
                   boolean do
                     if condstr
-                      must { match :_all, condstr, type: 'phrase_prefix' }
+                      must { match :_all, condstr, type: 'phrase_prefix' }          
                     else
                       must { all }
                     end
@@ -222,6 +232,7 @@ module DataTablesController
                     end
                   end
                 end
+                filter(:range, created_at: {gte: starttime,lte: endtime}) unless starttime.blank? || endtime.blank?
                 filter(:term, domain: domain_name) unless domain_name.blank?
                 es_block.call(self) if es_block.respond_to?(:call)
               end
@@ -261,17 +272,30 @@ module DataTablesController
 
           define_method action.to_sym do
             condition_local = ''
+            condition = ''
+
             unless params[:sSearch].blank?
               sort_column_id = params[:iSortCol_0].to_i
               sort_column = columns[sort_column_id]
               condstr = params[:sSearch].strip.gsub(/%/, '%%').gsub(/'/,"''")
 
               search_columns = options[:columns].map{|e| e.class == Symbol ? e : e[:attribute] }.compact
-              condition_local = search_columns.map do |column_name|
+              condition = search_columns.map do |column_name|
                 " ((text(#{column_name}) ILIKE '%#{condstr}%')) "
               end.compact.join(" OR ")
-              condition_local = " ( #{condition_local} ) " unless condition_local.blank?
+              condition = "(#{condition})" unless condition.blank?
+            end
+            unless params[:sStarttime].blank? || params[:sEndtime].blank?
+              sort_column_id = params[:iSortCol_0].to_i
+              sort_column = columns[sort_column_id]
+              if sort_column && sort_column.has_key?(:attribute)
+                starttime = params[:sStarttime]
+                endtime = params[:sEndtime]
+              end
+              condition = condition + "AND" unless condition.blank?
+              condition = condition + "(last_seen BETWEEN  '#{starttime}' AND '#{endtime}') " 
             end
+            condition_local = "(#{condition})" unless condition.blank?
 
             # We just need one conditions string for search at a time.  Every time we input
             # something else in the search bar we will pop the previous search condition

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_tables
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Duane Compton
@@ -12,10 +12,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -23,6 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.10'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails friendly interface into DataTables