will_filter 3.1.11 → 5.1.0

data/app/views/will_filter/filter/_conditions.html.erb

@@ -1,4 +1,3 @@
-
 <%= render :partial => '/will_filter/filter/conditions_header', :locals => {:wf_filter => wf_filter} %>
 
 <div class="body">
@@ -12,30 +11,34 @@
   <div class="filter_match_type">
     <div class="end">
       <small>
-        <%=link_to_function("Toggle Conditions", "wfFilter.toggleDebugger()") %>
+        <%= link_to("Toggle Conditions", "#", :onclick => "wfFilter.toggleDebugger();") %>
       </small>
     </div>
-    Match <%= select_tag(:wf_match, options_for_select(wf_filter.match_options, wf_filter.match), {:onChange=>"wfFilter.markDirty()"}) %>
+    Match <%= select_tag(:wf_match, options_for_select(wf_filter.match_options, wf_filter.match), {:onChange => "wfFilter.markDirty()"}) %>
     of the following conditions:
   </div>
 
   <% if wf_filter.size == 0 %>
     <div class="no_filter_hint">
-      You haven't added any filter conditions, so all of the results were returned.
-      Use the "Add" button in the bottom left corner to add a new condition or select
+      No filter conditions have been specified and all results have been returned.
+      Use the "+ Add Condition" button in the bottom left corner to add a new condition or select
       a predefined filter from a drop-down list above.
     </div>
   <% else %>
-    <table class="table" cellpadding="0" cellspacing="0">
+    <table>
       <% 0.upto(wf_filter.size-1) do |index| %>
         <% condition = wf_filter.condition_at(index) %>
-        <%= render :partial => "/will_filter/filter/condition", :locals => {:wf_filter => wf_filter, :condition => condition, :index => index}%>
+        <%= render :partial => '/will_filter/filter/condition', :locals => {
+            :wf_filter => wf_filter,
+            :condition => condition,
+            :index => index
+        } %>
       <% end %>
     </table>
   <% end %>
 
   <div id="wf_debugger" class="debugger" style="display:none;">
-      <%= raw(wf_filter.debug_sql_conditions) %>
+    <%= raw(wf_filter.debug_sql_conditions) %>
   </div>
 
-</div>
+</div>

data/app/views/will_filter/filter/_conditions_footer.html.erb

@@ -1,17 +1,32 @@
 <div class="actions">
-  Order:
-  <%= select_tag(:wf_order, options_for_select(wf_filter.condition_options, wf_filter.order), {:onChange=>"markDirty()"}) %>
-  <%= select_tag(:wf_order_type, options_for_select(wf_filter.order_type_options, wf_filter.order_type), {:onChange=>"markDirty()"}) %>
-  Per Page:
-  <%= select_tag(:wf_per_page, options_for_select(wf_filter.per_page_options, wf_filter.per_page.to_s), {:onChange=>"markDirty()"}) %>
+
+  <% if wf_filter.order_configurable? %>
+    Order:
+    <%= select_tag(:wf_order, options_for_select(wf_filter.condition_options, wf_filter.order), {:onChange => "markDirty()"}) %>
+    <%= select_tag(:wf_order_type, options_for_select(wf_filter.order_type_options, wf_filter.order_type), {:onChange => "markDirty()"}) %>
+  <% end %>
+
+  <% if wf_filter.per_page_configurable? %>
+    Per Page:
+    <%= select_tag(:wf_per_page, options_for_select(wf_filter.per_page_options, wf_filter.per_page.to_s), {:onChange => "markDirty()"}) %>
+  <% end %>
+
   &nbsp;&nbsp;
-  <%=link_to_function("<span>Submit Filter</span>".html_safe, "wfFilter.submit()", :class => "wf_grey_button wf_pcb") %>
+  <button type="button" class="btn btn-primary btn-xs" onclick="wfFilter.submit()">
+    Submit
+  </button>
 </div>
+
 <div>
-  <%=link_to_function("<span><b>&plus;</b> Add</span>".html_safe, "wfFilter.addCondition()", :class => "wf_grey_button wf_pcb") %>
-  <%=link_to_function("<span>Clear</span>".html_safe, "wfFilter.removeAllConditions()", :class => "wf_grey_button wf_pcb") %>
+  <button type="button" class="btn btn-default btn-xs" onclick="wfFilter.addCondition()">
+    + Add Condition
+  </button>
+  <button type="button" class="btn btn-default btn-xs" onclick="wfFilter.removeAllConditions()">
+    Clear All
+  </button>
+
   &nbsp;&nbsp;
   <span id="wf_loader" class="spinner" style="display:none;">
-    <%=image_tag "will_filter/spinner.gif" %> Loading...
+    <%= image_tag 'will_filter/loading.gif', style: 'height: 15px;' %>
   </span>
-</div>
+</div>

data/app/views/will_filter/filter/_conditions_header.html.erb

@@ -1,38 +1,52 @@
-<div style="margin:0;padding:0;display:inline">
-  <%= hidden_field_tag(:wf_id, wf_filter.id) %>
-  <%= hidden_field_tag(:wf_type, wf_filter.class.name) %>
-  <%= hidden_field_tag(:wf_dirty, "false") %>
-  <%= hidden_field_tag(:wf_submitted, "false") %>
-  <%= hidden_field_tag(:wf_name, wf_filter.name) %>
+<%= hidden_field_tag(:wf_id, wf_filter.id) %>
+<%= hidden_field_tag(:wf_type, wf_filter.class.name) %>
+<%= hidden_field_tag(:wf_dirty, "false") %>
+<%= hidden_field_tag(:wf_submitted, "false") %>
+<%= hidden_field_tag(:wf_name, wf_filter.name) %>
 
-  <% unless WillFilter::Config.require_filter_extensions? %>
-    <%= hidden_field_tag(:wf_model, wf_filter.model_class_name) %>
-  <% end %>
-    
-  <%= hidden_field_tag(:wf_export_format, "") %>
-  <%= hidden_field_tag(:wf_export_fields, "") %>
-</div>
+<% unless WillFilter::Config.require_filter_extensions? %>
+  <%= hidden_field_tag(:wf_model, wf_filter.model_class_name) %>
+<% end %>
 
-<div class="header">
+<%= hidden_field_tag(:wf_export_format, "") %>
+<%= hidden_field_tag(:wf_export_fields, "") %>
+
+<div class="wf_header">
   <% if wf_filter.show_export_options? %>
     <div class="end" style="padding-left:3px;">
-      <%=link_to_function("<span>Export Data...</span>".html_safe, "wfExporter.show(this)", :class => "wf_grey_button wf_pcb") %>
-    </div>  
+      <button type="button" class="btn btn-default btn-xs" onclick="wfExporter.show(this)">
+        Export Data...
+      </button>
+    </div>
   <% end %>
-  
+
   <% if wf_filter.show_save_options? %>
     <div class="end">
-      <%=link_to_function("<span>Save As New...</span>".html_safe, "wfFilter.saveFilter()", :class => "wf_grey_button wf_pcb") %>
+      <button type="button" class="btn btn-default btn-xs" onclick="wfFilter.saveFilter()">
+        Save As New...
+      </button>
+
       <% if wf_filter.id %>
-        <%=link_to_function("<span>Update</span>".html_safe, "wfFilter.updateFilter()", :class => "wf_grey_button wf_pcb") %>
-        <%=link_to_function("<span>Delete</span>".html_safe, "wfFilter.deleteFilter()", :class => "wf_grey_button wf_pcb") %>
+        <button type="button" class="btn btn-default btn-xs" onclick="wfFilter.updateFilter()">
+          Update
+        </button>
+        <button type="button" class="btn btn-default btn-xs" onclick="wfFilter.deleteFilter()">
+          Delete
+        </button>
       <% end %>
     </div>
   <% end %>
 
   <div>
-    <% unless wf_filter.saved_filters.empty? %>
-       <%= select_tag(:wf_key, options_for_select(wf_filter.saved_filters, wf_filter.key), {:onChange=>"wfFilter.loadSavedFilter()"}) %>
-    <% end %>
+    <% unless wf_filter.filter_options.empty? %>
+      <%= select_tag(:wf_key, grouped_options_for_select(wf_filter.filter_options, wf_filter.key), {:onChange => "wfFilter.loadSavedFilter()", style: 'width:250px'}) %>
+      <script>
+        $("#wf_key").select2({
+          placeholder: "Select pre-defined or saved filter"
+        }).on("change", function (e) {
+          wfFilter.loadSavedFilter();
+        });
+      </script>
+  <% end %>
   </div>
-</div>
+</div>

data/app/views/will_filter/filter/_container.html.erb

@@ -1,15 +1,16 @@
 <%= will_filter_scripts_tag %>
 
-<%= form_tag({}, {:method => :get, :name=>'wf_form', :id => 'wf_form', :class => 'wf_form' }) do %>
-<div class="wf_container">
+<%= form_tag({}, {:method => :get, :name => 'wf_form', :id => 'wf_form', :class => 'wf_form'}) do %>
 
-  <div id="wf_filter_conditions" class="conditions">
-    <%= render :partial=> '/will_filter/filter/conditions', :locals => { :wf_filter => wf_filter } %>
-  </div>
+  <div class="wf_container">
 
-  <div class="footer">
-    <%= render :partial => '/will_filter/filter/conditions_footer', :locals => { :wf_filter => wf_filter } %>
-  </div>
+    <div id="wf_filter_conditions" class="wf_conditions">
+      <%= render :partial => '/will_filter/filter/conditions', :locals => {:wf_filter => wf_filter} %>
+    </div>
 
-</div>
+    <div class="wf_footer">
+      <%= render :partial => '/will_filter/filter/conditions_footer', :locals => {:wf_filter => wf_filter} %>
+    </div>
+
+  </div>
 <% end %>

data/app/views/will_filter/filter/containers/_date.html.erb

@@ -1,10 +1,8 @@
-<table class='values' cellspacing='0px' cellpadding='0px'>
-	<tr>
-    <td width='99%'>
-			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value, :style => 'width:99%', :onChange => 'wfFilter.fieldChanged(this)')%>	
-    </td>
-		<td width='1%'>
-			<%=link_to_function(image_tag("will_filter/calendar.png", :title => "Select date", :class => "wf_calendar_trigger"), "wfCalendar.selectDate('wf_v#{index}_0', this)")%>	
-    </td>
-	</tr>
-</table>
+<div class="input-group" style="width: 99%;">
+  <%= text_field_tag("wf_v#{index}_0", container.sanitized_value, :class => 'form-control input-xs', 'aria-describedby' => "wf_v#{index}_0_addon", :onChange => 'wfFilter.fieldChanged(this)') %>
+  <span class="input-group-addon input-xs" id="<%="wf_v#{index}_0_addon"%>">
+    <%= link_to("#", :onclick => "wfCalendar.selectDate('wf_v#{index}_0', this);", :style=>'color: #666;') do %>
+    <i class="fa fa-calendar" aria-hidden="true"></i>
+    <% end %>
+  </span>
+</div>

data/app/views/will_filter/filter/containers/_date_range.html.erb

@@ -1,16 +1,24 @@
-<table class='values' cellspacing='0px' cellpadding='0px'>
-	<tr>
-    <td width='49%'>
-			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value(0), :style => 'width:98%', :onChange => 'wfFilter.fieldChanged(this)')%>	
+<table class='values' cellspacing='0px' cellpadding='0px' style="width: 99%">
+  <tr>
+    <td style="width: 50%;">
+      <div class="input-group" style="width: 100%; padding-right: 5px;">
+        <%= text_field_tag("wf_v#{index}_0", container.sanitized_value(0), :class => 'form-control input-xs', 'aria-describedby' => "wf_v#{index}_0_addon", :onChange => 'wfFilter.fieldChanged(this)') %>
+        <span class="input-group-addon input-xs" id="<%= "wf_v#{index}_0_addon" %>">
+          <%= link_to("#", :onclick => "wfCalendar.selectDate('wf_v#{index}_0', this);", :style => 'color: #666;') do %>
+            <i class="fa fa-calendar" aria-hidden="true" title="Select start date and time"></i>
+          <% end %>
+        </span>
+      </div>
     </td>
-		<td width='1%'>
-			<%=link_to_function(image_tag("will_filter/calendar.png", :title => "Select start date", :class => "wf_calendar_trigger"), "wfCalendar.selectDate('wf_v#{index}_0', this)")%>	
+    <td style="width: 50%;">
+      <div class="input-group" style="width: 100%;">
+        <%= text_field_tag("wf_v#{index}_1", container.sanitized_value(1), :class => 'form-control input-xs', 'aria-describedby' => "wf_v#{index}_1_addon", :onChange => 'wfFilter.fieldChanged(this)') %>
+        <span class="input-group-addon input-xs" id="<%= "wf_v#{index}_1_addon" %>">
+          <%= link_to("#", :onclick => "wfCalendar.selectDate('wf_v#{index}_1', this);", :style => 'color: #666;') do %>
+            <i class="fa fa-calendar" aria-hidden="true" title="Select start date and time"></i>
+          <% end %>
+        </span>
+      </div>
     </td>
-    <td width='49%'>
-			<%=text_field_tag("wf_v#{index}_1", container.sanitized_value(1), :style => 'width:98%', :onChange => 'wfFilter.fieldChanged(this)')%>	
-    </td>
-    <td width='1%'>
-			<%=link_to_function(image_tag("will_filter/calendar.png", :title => "Select end date", :class => "wf_calendar_trigger"), "wfCalendar.selectDate('wf_v#{index}_1', this)")%>	
-    </td>
-	</tr>
+  </tr>
 </table>

data/app/views/will_filter/filter/containers/_date_time.html.erb

@@ -1,10 +1,8 @@
-<table class='values' cellspacing='0px' cellpadding='0px'>
-	<tr>
-    <td width='99%'>
-			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value, :style => 'width:99%', :onChange => 'wfFilter.fieldChanged(this)')%>	
-    </td>
-		<td width='1%'>
-			<%=link_to_function(image_tag("will_filter/clock.png", :title => "Select date and time", :class => "wf_calendar_trigger"), "wfCalendar.selectDateTime('wf_v#{index}_0', this)")%>	
-    </td>
-	</tr>
-</table>
+<div class="input-group" style="width: 99%;">
+  <%= text_field_tag("wf_v#{index}_0", container.sanitized_value, :class => 'form-control input-xs', 'aria-describedby' => "wf_v#{index}_0_addon", :onChange => 'wfFilter.fieldChanged(this)') %>
+  <span class="input-group-addon input-xs" id="<%="wf_v#{index}_0_addon"%>">
+    <%= link_to("#", :onclick => "wfCalendar.selectDateTime('wf_v#{index}_0', this);", :style=>'color: #666;') do %>
+    <i class="fa fa-clock-o" aria-hidden="true"></i>
+    <% end %>
+  </span>
+</div>

data/app/views/will_filter/filter/containers/_date_time_range.html.erb

@@ -1,16 +1,24 @@
-<table class='values' cellspacing='0px' cellpadding='0px'>
-	<tr>
-    <td width='49%'>
-			<%=text_field_tag("wf_v#{index}_0", container.sanitized_value(0), :style => 'width:98%', :onChange => 'wfFilter.fieldChanged(this)')%>	
+<table class='values' cellspacing='0px' cellpadding='0px' style="width: 99%">
+  <tr>
+    <td style="width: 50%;">
+      <div class="input-group" style="width: 100%; padding-right: 5px;">
+        <%= text_field_tag("wf_v#{index}_0", container.sanitized_value(0), :class => 'form-control input-xs', 'aria-describedby' => "wf_v#{index}_0_addon", :onChange => 'wfFilter.fieldChanged(this)') %>
+        <span class="input-group-addon input-xs" id="<%= "wf_v#{index}_0_addon" %>">
+          <%= link_to("#", :onclick => "wfCalendar.selectDateTime('wf_v#{index}_0', this);", :style => 'color: #666;') do %>
+            <i class="fa fa-clock-o" aria-hidden="true" title="Select start date and time"></i>
+          <% end %>
+        </span>
+      </div>
     </td>
-		<td width='1%'>
-			<%=link_to_function(image_tag("will_filter/clock.png", :title => "Select start date and time", :class => "wf_calendar_trigger"), "wfCalendar.selectDateTime('wf_v#{index}_0', this)")%>	
+    <td style="width: 50%;">
+      <div class="input-group" style="width: 100%;">
+        <%= text_field_tag("wf_v#{index}_1", container.sanitized_value(1), :class => 'form-control input-xs', 'aria-describedby' => "wf_v#{index}_1_addon", :onChange => 'wfFilter.fieldChanged(this)') %>
+        <span class="input-group-addon input-xs" id="<%= "wf_v#{index}_1_addon" %>">
+          <%= link_to("#", :onclick => "wfCalendar.selectDateTime('wf_v#{index}_1', this);", :style => 'color: #666;') do %>
+            <i class="fa fa-clock-o" aria-hidden="true" title="Select start date and time"></i>
+          <% end %>
+        </span>
+      </div>
     </td>
-    <td width='49%'>
-			<%=text_field_tag("wf_v#{index}_1", container.sanitized_value(1), :style => 'width:98%', :onChange => 'wfFilter.fieldChanged(this)')%>	
-    </td>
-    <td width='1%'>
-			<%=link_to_function(image_tag("will_filter/clock.png", :title => "Select end date and time", :class => "wf_calendar_trigger"), "wfCalendar.selectDateTime('wf_v#{index}_1', this)")%>	
-    </td>
-	</tr>
+  </tr>
 </table>

data/app/views/will_filter/filter/containers/_list.html.erb

@@ -1,7 +1,17 @@
-<select style='width:100%' name='wf_v<%=index%>_0' id='wf_v<%=index%>_0' onChange='wfFilter.fieldChanged(this)'>
-	 <% container.options.each do |option| %>
-      <option <%= "selected" if option.last == container.value %> value="<%=option.last%>">
-        <%=option.first%>
+<div id="wf_v<%=index%>_0_border">
+  <select style='width:100%' name='wf_v<%= index %>_0' id='wf_v<%= index %>_0' onChange='wfFilter.fieldChanged(this)'>
+    <% container.options.each do |option| %>
+      <option <%= "selected" if option.last == container.value %> value="<%= option.last %>">
+        <%= option.first %>
       </option>
-	 <% end %>
-</select>
+    <% end %>
+  </select>
+</div>
+
+<script>
+  $("#wf_v<%=index%>_0").select2().on("change", function (e) {
+//    $('#wf_v<%=index%>_0_border').css({'border-width': '1px', 'border-color': 'red', 'border-style': 'solid', 'border-radius': '3px'});
+//    $('#wf_v<%=index%>_0_border').css({'background-color': 'red'});
+//    wfFilter.fieldChanged("#wf_v<%=index%>_0");
+  });
+</script>

data/config/routes.rb

@@ -1,5 +1,14 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2017 Michael Berkovich, theiceberk@gmail.com
+#
+#  __    __  ____  _      _          _____  ____  _     ______    ___  ____
+# |  |__|  ||    || |    | |        |     ||    || |   |      |  /  _]|    \
+# |  |  |  | |  | | |    | |        |   __| |  | | |   |      | /  [_ |  D  )
+# |  |  |  | |  | | |___ | |___     |  |_   |  | | |___|_|  |_||    _]|    /
+# |  `  '  | |  | |     ||     |    |   _]  |  | |     | |  |  |   [_ |    \
+#  \      /  |  | |     ||     |    |  |    |  | |     | |  |  |     ||  .  \
+#   \_/\_/  |____||_____||_____|    |__|   |____||_____| |__|  |_____||__|\_|
+#
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,22 +31,23 @@
 #++
 
 WillFilter::Engine.routes.draw do
-  match 'filter/index', :to => 'filter#index'
-  match 'filter/add_condition', :to => 'filter#add_condition'
-  match 'filter/update_condition', :to => 'filter#update_condition'
-  match 'filter/remove_condition', :to => 'filter#remove_condition'
-  match 'filter/remove_all_conditions', :to => 'filter#remove_all_conditions'
-  match 'filter/load_filter', :to => 'filter#load_filter'
-  match 'filter/save_filter', :to => 'filter#save_filter'
-  match 'filter/update_filter', :to => 'filter#update_filter'
-  match 'filter/delete_filter', :to => 'filter#delete_filter'
 
-  match 'calendar', :to => 'calendar#index'
-  match 'calendar/index', :to => 'calendar#index'
+  match 'filter/index', :to => 'filter#index', via: [:get, :post]
+  match 'filter/add_condition', :to => 'filter#add_condition', via: [:get, :post]
+  match 'filter/update_condition', :to => 'filter#update_condition', via: [:get, :post]
+  match 'filter/remove_condition', :to => 'filter#remove_condition', via: [:get, :post]
+  match 'filter/remove_all_conditions', :to => 'filter#remove_all_conditions', via: [:get, :post]
+  match 'filter/load_filter', :to => 'filter#load_filter', via: [:get, :post]
+  match 'filter/save_filter', :to => 'filter#save_filter', via: [:get, :post]
+  match 'filter/update_filter', :to => 'filter#update_filter', via: [:get, :post]
+  match 'filter/delete_filter', :to => 'filter#delete_filter', via: [:get, :post]
+
+  match 'calendar', :to => 'calendar#index', via: [:get, :post]
+  match 'calendar/index', :to => 'calendar#index', via: [:get, :post]
 
-  match 'exporter', :to => 'exporter#index'
-  match 'exporter/index', :to => 'exporter#index'
-  match 'exporter/export', :to => 'exporter#export'
+  match 'exporter', :to => 'exporter#index', via: [:get, :post]
+  match 'exporter/index', :to => 'exporter#index', via: [:get, :post]
+  match 'exporter/export', :to => 'exporter#export', via: [:get, :post]
 
-  root :to => "filter#index"
+  root :to => 'filter#index'
 end

data/deploy

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+def execute(cmd)
+  puts "\n***************************************************************************\n"
+  puts "$ #{cmd}"
+  system(cmd)
+end
+
+def version_file_path
+  './lib/will_filter/version.rb'
+end
+
+def version_file
+  @version_file ||= File.read(version_file_path)
+end
+
+def version
+  @version ||= version_file.match(/VERSION\s*=\s*'([^']*)'/)[1]
+end
+
+def increment_version
+  parts = version.split('.')
+  parts[2] = (parts[2].to_i + 1).to_s
+  new_version = parts.join('.')
+
+  version_file.gsub!(version, new_version)
+
+  File.open(version_file_path, 'w') do |file|
+    file.write(version_file)
+  end
+
+  @version_file = nil
+  @version = nil
+end
+
+puts "\nBuilding will_filter-#{version}.gem..."
+
+if ARGV.include?('release')
+  execute('git checkout master')
+  execute('git merge develop')
+  execute('git push')
+end
+
+execute('bundle exec rspec')
+execute('gem build will_filter.gemspec')
+execute("gem install will_filter-#{version}.gem --no-ri --no-rdoc")
+
+if ARGV.include?('release')
+  execute("git tag #{version}")
+  execute('git push --tags')
+
+  execute("gem push will_filter-#{version}.gem")
+
+  execute('git checkout develop')
+
+  increment_version
+  execute("git add #{version_file_path}")
+  execute("git commit -m 'Updated version to #{version}'")
+  execute('git push')
+end
+
+
+