Update search software dynamically by selecting a category

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>

Update search software dynamically by selecting a category
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Luciano Prestes · Gabriela Navarro
1 parent 18427e7c
Showing 5 changed files with 53 additions and 65 deletions Show diff stats
lib/ext/search_controller.rb
public/software-catalog.js
views/search/_catalog_filter.html.erb
views/search/_mpog_search_form.html.erb
views/search/software_infos.html.erb
@@ -22,11 +22,12 @@ class SearchController
   def software_infos
-    prepare_search_page
+    prepare_software_search_page
     results = filter_software_infos_list
     results = results.paginate(:per_page => 24, :page => params[:page])
     @searches[@asset] = {:results => results}
     @search = results
+    render :layout=>false if request.xhr?
   end
   def filter_communities_list
@@ -53,7 +54,7 @@ class SearchController
     category_ids = []
     unless params[:selected_categories].blank?
-      category_ids = params[:selected_categories].values
+      category_ids = params[:selected_categories]
     end
     category_ids = category_ids.map(&:to_i)
@@ -72,47 +73,30 @@ class SearchController
     filtered_community_list
   end
-  def get_search_result
-    redirect_to "/" unless request.xhr?
-
-    selected_categories = {}
-    params[:categories_ids].each do |id|
-      selected_categories[Category.find(id).name] = id
-    end
-    params[:selected_categories] = selected_categories
-
-    prepare_search_page
-
-    results = filter_software_infos_list
-    results = results.paginate(:per_page => 24, :page => params[:page])
-
-    @searches[@asset] = {:results => results}
-    @search = results
-    render "/software_infos", :layout=>false
-  end
-
   protected
-  def prepare_search_page
+  def prepare_software_search_page
     @titles[:software_infos] = _("Public Software Catalog")
     @category_filters = []
     @categories = Category.all
     @selected_categories = params[:selected_categories]
+    @selected_categories ||= []
+    @selected_categories = @selected_categories.map(&:to_i)
-    @selected_categories_name = []
-    @message_selected_options = "Most options"
-    unless @selected_categories.nil?
+    @message_selected_options = ""
+    unless @selected_categories.empty?
       @message_selected_options = _("Selected options: ")
-      @selected_categories.each do |k, v|
-        @message_selected_options << "#{k}; "
-        @selected_categories_name << k
-      end
+
+      categories = Category.find(@selected_categories)
+      @message_selected_options += categories.collect { |category|
+        "#{category.name}; "
+      }.join()
     end
     @categories.sort!{|a, b| a.name <=> b.name}
     @categories_groupe_one = []
     @categories_groupe_two = []
-    (0..(@categories.count - 1)).each do |i|
+    @categories.count.times do |i|
       if i % 2 == 0
         @categories_groupe_one << @categories[i]
       else
@@ -4,8 +4,8 @@
   var AJAX_URL = {
     get_categories:
       url_with_subdirectory("/plugin/mpog_software/get_categories"),
-    get_search_result:
-      url_with_subdirectory("/search/get_search_result")
+    software_infos:
+      url_with_subdirectory("/search/software_infos")
   };
   function create_catalog_element(first, value, id) {
@@ -90,6 +90,14 @@
     });
   }
+  function selectCheckboxCategory() {
+    $("#filter-categories-option").slideUp();
+    $("#filter-categories-select-catalog").show();
+    $("#filter-option-catalog-software").hide();
+
+    dispatch_search_ajax(update_search_page_on_ajax);
+  }
+
   function dispatch_search_ajax(callback) {
     var query_text = $("#search-input").val();
     var selected_categories_ids = [];
@@ -98,31 +106,27 @@
       selected_categories_ids.push(element.value);
     });
-
     $.ajax({
-      url: AJAX_URL.get_search_result,
+      url: AJAX_URL.software_infos,
       type: "GET",
       data: {
         query: query_text,
-        categories_ids: selected_categories_ids
+        selected_categories: selected_categories_ids
       },
-      success: function(response) {
-        console.log(response);
-        callback(response);
-      }
+      success: callback
     });
   }
-  function update_page_list() {
-
-  }
+  function update_search_page_on_ajax(response) {
+    var search_list = $("#search-results");
+    var selected_categories_field = $("#filter-categories-select-catalog");
-  function selectCheckboxCategory() {
-    $("#filter-categories-option").slideUp();
-    $("#filter-categories-select-catalog").show();
-    $("#filter-option-catalog-software").hide();
+    var result_list = $(response).find("#search-results").html();
+    var result_categories = $(response).find("#filter-categories-select-catalog").html();
-    dispatch_search_ajax(update_page_list);
+    search_list.html(result_list);
+    selected_categories_field.html(result_categories);
+    show_head_message();
   }
   function selectProjectSoftwareCheckbox() {
@@ -2,7 +2,7 @@
 <div id="filter-catalog-software">
-  <div id="filter-option-catalog-software"> Mais opções </div>
+  <div id="filter-option-catalog-software"><%= _("More options") %></div>
    <!--Quando tiver filtros(categorias)selecionados mostrar esta opção: Opções selecionadas-->
   <div id="filter-categories-select-catalog"> <%= @message_selected_options %> </div>
@@ -14,7 +14,7 @@
       <div id="gruop-catalog-01">
         <% @categories_groupe_one.each do |category| %>
           <label>
-            <%= check_box_tag("selected_categories[#{category.name}]", category.id, @selected_categories_name.include?(category.name), :class => "categories-catalog") %>
+            <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %>
             <span><%= _("#{category.name}") %></span>
           </label> <br>
         <% end %>
@@ -22,7 +22,7 @@
       <div id="group-catalog-02">
         <% @categories_groupe_two.each do |category| %>
           <label>
-            <%= check_box_tag("selected_categories[#{category.name}]", category.id, @selected_categories_name.include?(category.name), :class => "categories-catalog") %>
+            <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %>
                     <%= _("#{category.name}") %>
           </label> <br>
         <% end %>
@@ -10,8 +10,7 @@
     <div class="search-field">
       <span class="formfield">
-        <%= text_field_tag 'query', @query, :id => 'search-input', :size => 50 %>
-        <%= javascript_tag "jQuery('#search-input').attr('title', \"#{hint}\").hint()" if defined?(hint) %>
+        <%= text_field_tag 'query', @query, :id => 'search-input', :size => 50, :placeholder=>_("Type words about the software_info you're looking for") %>
       </span>
       <%= submit_button(:search, _('Search'), :class => "button with-text icon-search submit") %>
@@ -30,4 +29,3 @@
   <div style="clear: both"></div>
 </div>
-<div>
-<%= search_page_title( @titles[@asset], @category ) %>
+<div id="software-search-container">
+  <%= search_page_title( @titles[@asset], @category ) %>
-<%= render :partial => 'mpog_search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
+  <%= render :partial => 'mpog_search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
-<%= render :partial => 'results_header' %>
+  <%= render :partial => 'results_header' %>
-<%= display_results(@searches, @asset) %>
-<% if params[:display] != 'map' %>
-  <%= pagination_links @searches[@asset][:results] %>
-<% end %>
+  <%= display_results(@searches, @asset) %>
+  <% if params[:display] != 'map' %>
+    <%= pagination_links @searches[@asset][:results] %>
+  <% end %>
-<div style="clear: both"></div>
+  <div style="clear: both"></div>
-<% if @asset == :product %>
-  <%= javascript_tag do %>
-    jQuery('.search-product-price-details').altBeautify();
+  <% if @asset == :product %>
+    <%= javascript_tag do %>
+      jQuery('.search-product-price-details').altBeautify();
+    <% end %>
   <% end %>
-<% end %>
+</div>
 \ No newline at end of file
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2		2
3	<div id="filter-catalog-software">	3	<div id="filter-catalog-software">
4		4
5	- <div id="filter-option-catalog-software"> Mais opções </div>	5	+ <div id="filter-option-catalog-software"><%= _("More options") %></div>
6	<!--Quando tiver filtros(categorias)selecionados mostrar esta opção: Opções selecionadas-->	6	<!--Quando tiver filtros(categorias)selecionados mostrar esta opção: Opções selecionadas-->
7		7
8	<div id="filter-categories-select-catalog"> <%= @message_selected_options %> </div>	8	<div id="filter-categories-select-catalog"> <%= @message_selected_options %> </div>
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	<div id="gruop-catalog-01">	14	<div id="gruop-catalog-01">
15	<% @categories_groupe_one.each do \|category\| %>	15	<% @categories_groupe_one.each do \|category\| %>
16	<label>	16	<label>
17	- <%= check_box_tag("selected_categories[#{category.name}]", category.id, @selected_categories_name.include?(category.name), :class => "categories-catalog") %>	17	+ <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %>
18	<span><%= _("#{category.name}") %></span>	18	<span><%= _("#{category.name}") %></span>
19	</label> <br>	19	</label> <br>
20	<% end %>	20	<% end %>
	@@ -22,7 +22,7 @@		@@ -22,7 +22,7 @@
22	<div id="group-catalog-02">	22	<div id="group-catalog-02">
23	<% @categories_groupe_two.each do \|category\| %>	23	<% @categories_groupe_two.each do \|category\| %>
24	<label>	24	<label>
25	- <%= check_box_tag("selected_categories[#{category.name}]", category.id, @selected_categories_name.include?(category.name), :class => "categories-catalog") %>	25	+ <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %>
26	<%= _("#{category.name}") %>	26	<%= _("#{category.name}") %>
27	</label> <br>	27	</label> <br>
28	<% end %>	28	<% end %>