Add sort and display in software's filter ajax

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

Add sort and display in software's filter ajax
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Fabio Teixeira · Gabriela Navarro
1 parent b2ff44d1
Showing 5 changed files with 82 additions and 22 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
@@ -24,7 +24,7 @@ class SearchController
   def software_infos
     prepare_software_search_page
     results = filter_software_infos_list
-    results = results.paginate(:per_page => 24, :page => params[:page])
+    results = results.paginate(:per_page => @per_page, :page => params[:page])
     @searches[@asset] = {:results => results}
     @search = results
     render :layout=>false if request.xhr?
@@ -70,6 +70,11 @@ class SearchController
       filtered_community_list << software.community
     end
+    filtered_community_list.sort!{|a, b| a.name <=> b.name}
+    if params[:sort] && params[:sort] == "desc"
+      filtered_community_list.reverse!
+    end
+
     filtered_community_list
   end
@@ -103,5 +108,14 @@ class SearchController
         @categories_groupe_two << @categories[i]
       end
     end
+
+    @per_page = 15
+    if params[:software_display]
+      if params[:software_display] == "all"
+        @per_page = SoftwareInfo.count
+      else
+        @per_page = params[:software_display].to_i
+      end
+    end
   end
 end
@@ -57,22 +57,16 @@
   function dispatch_search_ajax(callback) {
-    var query_text = $("#search-input").val();
-    var selected_categories_ids = [];
+    var search_params = get_search_params();
-    $(".categories-catalog:checked").each(function(index, element) {
-      selected_categories_ids.push(element.value);
-    });
+    console.log(search_params);
     open_loading("Loading");
     $.ajax({
       url: AJAX_URL.software_infos,
       type: "GET",
-      data: {
-        query: query_text,
-        selected_categories: selected_categories_ids
-      },
+      data: search_params,
       success: callback,
       error: function(){
         close_loading();
@@ -81,16 +75,33 @@
   }
+  function get_search_params() {
+    var params = {};
+
+    params.query = $("#search-input").val();
+    params.selected_categories = [];
+
+    $(".categories-catalog:checked").each(function(index, element) {
+      params.selected_categories.push(element.value);
+    });
+
+    params.software_display = $("#software_display").val();
+    params.sort = $("#sort").val();
+
+    return params;
+  }
+
+
   function update_search_page_on_ajax(response) {
     close_loading();
     response = $(response);
     var search_list = $("#search-results");
     var selected_categories_field = $("#filter-categories-select-catalog");
-    var pagination = $(".pagination");
+    var pagination = $("#software-pagination");
     var result_list = response.find("#search-results").html();
     var result_categories = response.find("#filter-categories-select-catalog").html();
-    var result_pagination = response.find(".pagination").html();
+    var result_pagination = response.find("#software-pagination").html();
     search_list.html(result_list);
     selected_categories_field.html(result_categories);
@@ -103,8 +114,14 @@
     $("#filter-categories-option").slideUp();
     $("#filter-categories-select-catalog").show();
     $("#filter-option-catalog-software").hide();
+
+    dispatch_search_ajax(update_search_page_on_ajax);
+    show_head_message();
   }
+  function update_page_by_ajax_on_select_change() {
+    dispatch_search_ajax(update_search_page_on_ajax);
+  }
   function set_events() {
     $("#filter-option-catalog-software").click(slideDowsCategoriesOptionAndHideOptionCatalog);
@@ -113,6 +130,8 @@
     $("#cleanup-filter-catalg").click(clearCatalogCheckbox);
     $(".categories-catalog").click(selectCheckboxCategory);
     $(".project-software").click(selectProjectSoftwareCheckbox);
+    $("#software_display").change(update_page_by_ajax_on_select_change);
+    $("#sort").change(update_page_by_ajax_on_select_change);
   }
@@ -32,10 +32,9 @@
   <div class="project-software"> <%= _("Software Projects:") %>
     <label><input type="checkbox" name="filter" value="Incluir nos resultados"> <%= _("Include in results") %> </label>
-    <span class"doubts-catalog-software" title="Incluir projetos de software em desenvolvimento que ainda não são oficialmente Software Público Brasileiro.">(?)</span>
-    <!--<p><acronym title="Incluir projetos de software em desenvolvimento que ainda não são oficialmente Software Público Brasileiro.">(?)
-    </acronym></p>-->
-  </div><br>
+    <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">(?)</span>
+  </div>
+  <br />
   <%= button_tag _("Clean up"), :id => "cleanup-filter-catalg", :type => "button" %>
   <%= button_tag _("Close"), :id => "close-filter-catalog", :type => "button" %>
 </div>
 <div class='search-form'>
-
   <%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
                  :method => 'get', :class => 'search_form' ) do %>
@@ -13,11 +12,37 @@
         <%= 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')) %>
+      <%= submit_button(:search, _('Filter')) %>
     </div>
-
     <%= render :partial => 'search_form_extra_fields' %>
     <%= render :partial => 'catalog_filter' %>
+
+    <!-- #display-options sera substituido pelo html passado pela equipe de design -->
+    <div id="display-options" class="">
+      <div>
+        <strong><%= SoftwareInfo.count %> Softwares</strong>
+      </div>
+
+      <div>
+        <div>
+          Show:
+          <%= select_tag("software_display",
+            options_for_select(['15', '30', '90', 'All'], :selected=>params[:display])
+          ) %>
+        </div>
+
+        <div>
+          Sort by:
+          <%= select_tag("sort",
+            options_for_select(
+              [
+                [_("Name A-Z"), 'asc'],
+                [_("Name Z-A"), 'desc']
+              ], :selected=>params[:sort])
+          ) %>
+        </div>
+      </div>
+    </div>
   <% end %>
   <% if @empty_query %>
@@ -6,9 +6,12 @@
   <%= render :partial => 'results_header' %>
   <%= display_results(@searches, @asset) %>
-  <% if params[:display] != 'map' %>
-    <%= pagination_links @searches[@asset][:results] %>
-  <% end %>
+
+  <div id="software-pagination">
+    <% if params[:display] != 'map' %>
+      <%= pagination_links @searches[@asset][:results] %>
+    <% end %>
+  </div>
   <div style="clear: both"></div>
1	<div class='search-form'>	1	<div class='search-form'>
2	-
3	<%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },	2	<%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
4	:method => 'get', :class => 'search_form' ) do %>	3	:method => 'get', :class => 'search_form' ) do %>
5		4
	@@ -13,11 +12,37 @@		@@ -13,11 +12,37 @@
13	<%= text_field_tag 'query', @query, :id => 'search-input', :size => 50, :placeholder=>_("Type words about the software_info you're looking for") %>	12	<%= text_field_tag 'query', @query, :id => 'search-input', :size => 50, :placeholder=>_("Type words about the software_info you're looking for") %>
14	</span>	13	</span>
15		14
16	- <%= submit_button(:search, _('Search')) %>	15	+ <%= submit_button(:search, _('Filter')) %>
17	</div>	16	</div>
18	-
19	<%= render :partial => 'search_form_extra_fields' %>	17	<%= render :partial => 'search_form_extra_fields' %>
20	<%= render :partial => 'catalog_filter' %>	18	<%= render :partial => 'catalog_filter' %>
		19	+
		20	+ <!-- #display-options sera substituido pelo html passado pela equipe de design -->
		21	+ <div id="display-options" class="">
		22	+ <div>
		23	+ <strong><%= SoftwareInfo.count %> Softwares</strong>
		24	+ </div>
		25	+
		26	+ <div>
		27	+ <div>
		28	+ Show:
		29	+ <%= select_tag("software_display",
		30	+ options_for_select(['15', '30', '90', 'All'], :selected=>params[:display])
		31	+ ) %>
		32	+ </div>
		33	+
		34	+ <div>
		35	+ Sort by:
		36	+ <%= select_tag("sort",
		37	+ options_for_select(
		38	+ [
		39	+ [_("Name A-Z"), 'asc'],
		40	+ [_("Name Z-A"), 'desc']
		41	+ ], :selected=>params[:sort])
		42	+ ) %>
		43	+ </div>
		44	+ </div>
		45	+ </div>
21	<% end %>	46	<% end %>
22		47
23	<% if @empty_query %>	48	<% if @empty_query %>