ransack_advanced_search 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82bba0e8cbaf970ff9d233609ac59bf155bfa084
-  data.tar.gz: 36b15a6a0de51c434d5d10018378aeeb9560bf74
+  metadata.gz: 709e75317b253464253e2227e66d97ae1120ead2
+  data.tar.gz: 85ec334b704763e7f559041cfbc392ec703513b0
 SHA512:
-  metadata.gz: 7a1bdb8394ed1c8c0a1bd121915f0aa3f0b7b8a193be7f15fe7846c77ceaf515ea728d5354100b97a0cd001a2f3fdb9ad29989fdc625f3ce7f07bffbb5650cae
-  data.tar.gz: 05870bf3a5d6c051f8b42f0c87552539aeeb54ad722d6ba8f2386c8bc545f4390983937d27c7c9d130e0320dfee269f8ed91312e633f6676d7b693b2fc8a74c0
+  metadata.gz: 667d4d911afe7cffdc24dc46777adfb5e0ef7114c35abac12c43dabdbf69b888c1368739db65ad7e46df0bd55b4ccc0719f4db4659d41681cdd0e02a024db798
+  data.tar.gz: 47400c50f9d161176080e4d0fd74a02ab5a323313de1370495e49fd1e881b6e7846b053eba9ef86c615aa7928d18bb766668acc80f0717695aabdaf76594a651

data/README.md

@@ -101,7 +101,7 @@ In your application layout `app/views/layouts/application.erb`, include a yield
   </body>
 </html>
 ```
-In the view that you want the advanced search views, insert the following:
+In the view that you want the advanced search views you can choose betwenn quick_search and advanced_search views, so insert the following for advanced_search:
 
 ```ruby
   <%= render partial: 'ransack_advanced_search/advanced_search',
@@ -112,6 +112,18 @@ In the view that you want the advanced search views, insert the following:
   %>
 ```
 
+Or, the following for quick_search:
+
+```ruby
+  <%= render partial: 'ransack_advanced_search/quick_search',
+    locals: {
+       search_url: advanced_search_your_models_path, # POST route we created above
+       redirect_path: your_models_path # GET redirect path, to return after some actions
+    }
+  %>
+```
+
+
 All done! Enjoy the search!
 
 ## Saving Searches

data/app/helpers/ransack_advanced_search_helper.rb

@@ -1,15 +1,38 @@
 module RansackAdvancedSearchHelper
-  def setup_search_form(builder)
+  def setup_search_form(builder, search_object)
     fields = builder.grouping_fields builder.object.new_grouping,
       object_name: 'new_object_name', child_index: "new_grouping" do |f|
       render('ransack_advanced_search/grouping_fields', f: f)
     end
     content_for :ransack_setup, %Q{
       var search = new Search({grouping: "#{escape_javascript(fields)}"});
+      search.fieldsType = #{get_fields_data_type(search_object).to_json.html_safe}
+      search.convertFieldType = function (fieldType) {
+        var fieldTypeToHtmlType = {
+          'default': 'text',
+          'integer': 'number',
+          'date' : 'date',
+          'datetime' : 'date'
+        }
+        return (fieldTypeToHtmlType[fieldType] || fieldTypeToHtmlType['default']);
+      }
+      search.changeValueInputsType = function(element, fieldName) {
+        fieldType = search.fieldsType[fieldName];
+        conditionValueInputs = $(element).parents('.ransack-condition-field').find('.ransack-attribute-value');
+        conditionValueInputs.attr('type', search.convertFieldType(fieldType));
+      }
       $(document).on("click", "button.add_fields", function() {
         search.add_fields(this, $(this).data('fieldType'), $(this).data('content'));
+        if($(this).hasClass('ransack-add-attribute')) {
+          fieldName = $(this).parents('.ransack-condition-field').find('select.ransack-attribute-select').find('option:selected')[0].value;
+          search.changeValueInputsType(this, fieldName)
+        }
         return false;
       });
+      $(document).on('change', 'select.ransack-attribute-select', function(e) {
+        fieldName = $(this).find('option:selected')[0].value;
+        search.changeValueInputsType(this, fieldName)
+      });
       $(document).on("click", "i.remove_fields", function() {
         search.remove_fields(this);
         return false;
@@ -21,16 +44,28 @@ module RansackAdvancedSearchHelper
     }.html_safe
   end
 
+  def get_fields_data_type(search)
+    bases = [''] + search.klass.ransackable_associations
+    fields_type = Hash.new
+    bases.each do |model|
+      model_name = model.present? ? "#{model}_" : ""
+      search.context.traverse(model).columns_hash.each do |field, attributes|
+        fields_type["#{model_name}#{field}"] = attributes.type
+      end
+    end
+    fields_type
+  end
+
   def button_to_remove_fields
     content_tag :i, nil, class: 'remove_fields glyphicon glyphicon-remove text-danger'
   end
 
-  def button_to_add_fields(name, f, type)
+  def button_to_add_fields(name, f, type, custom_class='')
     new_object = f.object.send "build_#{type}"
     fields = f.send("#{type}_fields", new_object, child_index: "new_#{type}") do |builder|
       render('ransack_advanced_search/' + type.to_s + "_fields", f: builder)
     end
-    content_tag :button, name, :class => 'add_fields btn btn-default btn-sm', :type => 'button', 'data-field-type' => type, 'data-content' => "#{fields}"
+    content_tag :button, name, :class => custom_class + ' add_fields btn btn-default btn-sm', :type => 'button', 'data-field-type' => type, 'data-content' => "#{fields}"
   end
 
   def button_to_nest_fields(name, type)

data/app/views/ransack_advanced_search/_advanced_search.html.erb

@@ -9,9 +9,9 @@
   <% else %>
     <div class="col-md-12">
   <% end %>
-      <%= search_form_for(@search, url: search_url, html: { method: :post, class: 'form-vertical', role: 'form'  }) do |f| %>
+      <%= search_form_for(@search, url: search_url, html: { method: :post, class: 'form-inline', role: 'form'  }) do |f| %>
 
-        <% setup_search_form f %>
+        <% setup_search_form f, @search %>
 
         <% if RansackAdvancedSearch.enable_saved_searches %>
           <div class="form-group">
@@ -43,6 +43,7 @@
 
         <!-- <%= label_tag :distinct, 'Return distinct records?' %> -->
         <!-- <%= check_box_tag :distinct, '1', params[:distinct].to_i == 1 %> -->
+        <div class="clearfix"></div>
         <div class="form-group">
           <%= f.submit t('ransack.advanced_search.form.submit_text'), class: 'btn btn-primary' %>
           <% if RansackAdvancedSearch.enable_saved_searches %>

data/app/views/ransack_advanced_search/_attribute_fields.erb

@@ -1,3 +1,3 @@
 <%= content_tag(:span,
-  f.attribute_select({associations: @search.klass.ransackable_associations}, {class: 'form-control input-sm'}),
+  f.attribute_select({associations: @search.klass.ransackable_associations}, {class: 'ransack-attribute-select form-control input-sm'}),
   { class: 'fields', 'data-object-name' => f.object_name }, false) %>

data/app/views/ransack_advanced_search/_condition_fields.erb

@@ -1,5 +1,5 @@
 <%= content_tag :div, {
-  class: 'fields condition', 'data-object-name' => f.object_name
+  class: 'fields condition ransack-condition-field', 'data-object-name' => f.object_name
   } do %>
 
   <%= content_tag(:span, button_to_remove_fields,
@@ -16,6 +16,6 @@
   <% end %>
 
   <%= button_to_add_fields t('ransack.advanced_search.attribute_value.add'),
-      f, :value %>
+      f, :value, 'ransack-add-attribute' %>
 
 <% end %>

data/app/views/ransack_advanced_search/_grouping_fields.erb

@@ -1,20 +1,33 @@
 <%= content_tag :div, { class: 'fields',
   'data-object-name' => f.object_name } do %>
 
+  <% remove_able = true if local_assigns[:remove_able].nil? %>
+  <% if remove_able == false %>
+    <%= content_tag(:span, "#{t('ransack.advanced_search.condition_group.match')}
+      #{f.combinator_select({}, {class: 'form-control input-sm'})}
+      #{t('ransack.advanced_search.condition_group.match_condition')}", nil, false) %>
+  <% else %>
+    <%= content_tag(:span, "#{t('ransack.advanced_search.condition_group.match')}
+      #{f.combinator_select({}, {class: 'form-control input-sm'})} #{t('ransack.advanced_search.condition_group.match_condition')}
+      #{button_to_remove_fields}", nil, false) %>
+  <% end %>
 
-  <%= content_tag(:span, "#{t('ransack.advanced_search.condition_group.match')}
-    #{f.combinator_select} #{t('ransack.advanced_search.condition_group.match_condition')}
-    #{button_to_remove_fields}", nil, false) %>
-
-  <%= f.condition_fields do |c| %>
+  <% condition_fields = f.condition_fields do |c| %>
     <%= render 'ransack_advanced_search/condition_fields', f: c %>
   <% end %>
+  <%= condition_fields %>
+  <% if condition_fields.empty? %>
+    <%= f.send("condition_fields", f.object.send("build_condition"), child_index: "new_condition") do |builder| %>
+      <%= render 'ransack_advanced_search/condition_fields', f: builder %>
+    <% end %>
+  <% end %>
 
   <%= button_to_add_fields t('ransack.advanced_search.attribute_field.add'),
       f, :condition %>
 
   <%= f.grouping_fields do |g| %>
-    <%= render 'ransack_advanced_search/grouping_fields', f: g %>
+    <%= render partial: 'ransack_advanced_search/grouping_fields',
+               locals: { f: g, remove_able: true } %>
   <% end %>
 
 <% end %>

data/app/views/ransack_advanced_search/_quick_search.html.erb

@@ -0,0 +1,65 @@
+<div class="ransack-advanced-search">
+
+  <div class="row">
+  <% if RansackAdvancedSearch.enable_saved_searches %>
+    <div class="col-md-4">
+      <%= render 'ransack_advanced_search/saved_searches_list' %>
+    </div>
+    <div class="col-md-8">
+  <% else %>
+    <div class="col-md-12">
+  <% end %>
+      <%= search_form_for(@search, url: search_url, html: { method: :post, class: 'form-inline', role: 'form'  }) do |f| %>
+
+        <% setup_search_form f, @search %>
+
+        <% if RansackAdvancedSearch.enable_saved_searches %>
+          <div class="form-group">
+            <%= label_tag 'Descrição da Busca (necessária para salvar a busca)' %>
+            <%= text_field_tag :description, @saved_search.try(:description), class: 'form-control input-sm' %>
+            <% if @saved_search %>
+              <%= hidden_field_tag :saved_search, @saved_search.id %>
+              <%= hidden_field_tag :use_search_params, true %>
+            <% end %>
+          </div>
+        <% end %>
+
+        <h4><%= t('ransack.quick_search.condition_group.title') %></h4>
+        <div class="form-group">
+          <% if f.grouping_fields.empty? %>
+            <%= render partial: 'ransack_advanced_search/grouping_fields',
+                       locals: { f: f, remove_able: false } %>
+          <% else %>
+            <%= f.grouping_fields do |g| %>
+              <%= render partial: 'ransack_advanced_search/grouping_fields',
+                         locals: { f: f, remove_able: true } %>
+            <% end %>
+            <%= button_to_add_fields t('ransack.advanced_search.condition_group.add'),
+                f, :grouping %>
+          <% end %>
+        </div>
+
+        <div class="clearfix"></div>
+        <div class="form-group">
+          <%= f.submit t('ransack.advanced_search.form.submit_text'), class: 'btn btn-primary' %>
+          <% if RansackAdvancedSearch.enable_saved_searches %>
+            <%= f.submit t('ransack.advanced_search.form.save_submit_text'), name: 'save_search', class: 'btn btn-primary' %>
+            <%= f.submit t('ransack.advanced_search.form.save_new_submit_text'), name: 'save_new_search', class: 'btn btn-primary' %>
+          <% end %>
+          <%= link_to t('ransack.advanced_search.form.clear_search_text'), redirect_path, class: 'btn btn-default' %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<% content_for(:ransack_advanced_search_setup) do %>
+  <%= stylesheet_link_tag 'ransack_advanced_search/application', media: 'all' %>
+  <%= javascript_include_tag 'ransack_advanced_search/application' %>
+
+  <script>
+    $(document).ready(function () {
+      <%= yield(:ransack_setup) %>
+    });
+  </script>
+<% end %>

data/app/views/ransack_advanced_search/_value_fields.erb

@@ -1,2 +1,2 @@
-<%= content_tag(:span, f.text_field(:value, {class: 'form-control input-sm'}),
+<%= content_tag(:span, f.text_field(:value, {class: 'form-control input-sm ransack-attribute-value'}),
   { class: 'fields value', 'data-object-name' => f.object_name }, false) %>

data/config/locales/ransack.en.yml

@@ -1,5 +1,8 @@
 en:
   ransack:
+    quick_search:
+      condition_group:
+        title: Conditions
     advanced_search:
       form:
         submit_text: Search

data/config/locales/ransack.pt-BR.yml

@@ -1,5 +1,8 @@
 pt-BR:
   ransack:
+    quick_search:
+      condition_group:
+        title: Filtros
     advanced_search:
       form:
         submit_text: Pesquisar

data/lib/ransack_advanced_search/version.rb

@@ -1,3 +1,3 @@
 module RansackAdvancedSearch
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ransack_advanced_search
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - David Brusius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,6 +85,7 @@ files:
 - app/views/ransack_advanced_search/_attribute_fields.erb
 - app/views/ransack_advanced_search/_condition_fields.erb
 - app/views/ransack_advanced_search/_grouping_fields.erb
+- app/views/ransack_advanced_search/_quick_search.html.erb
 - app/views/ransack_advanced_search/_saved_searches_list.erb
 - app/views/ransack_advanced_search/_sort_fields.erb
 - app/views/ransack_advanced_search/_value_fields.erb