Add public_software filter, sort and page limit on ajax

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

Add public_software filter, sort and page limit on ajax
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Fabio Teixeira · Gabriela Navarro
1 parent f6d72f7e
Showing 7 changed files with 62 additions and 15 deletions Show diff stats
features/software_catalog.feature
features/step_definitions/mpog_steps.rb
lib/ext/search_controller.rb
public/software-catalog.js
test/helpers/plugin_test_helper.rb
views/search/_catalog_filter.html.erb
views/search/_full_community.html.erb
@@ -17,36 +17,56 @@ Feature: Search software
       | Software | Health      | true            |
       | Software | Education   | true            |
     And the following softwares
-      | name         | public_software | categories        |
-      | Software One | true            | Health            |
-      | Software Two | false           | Health, Education |
+      | name           | public_software | categories        |
+      | Software One   | true            | Health            |
+      | Software Two   | true            | Health, Education |
+      | Software Three | false           | Education         |
-  Scenario: Show all softwares when open search page
+  Scenario: Show all "public_software" softwares when open search page
     Given I go to /search/software_infos
     Then I should see "Software One"
     Then I should see "Software Two"
-  Scenario: Show all softwares when search software
+  Scenario: Show all "public_software" softwares when search software
     Given I go to /search/software_infos
     And I fill in "search-input" with "Software"
     Then I should see "Software One"
     Then I should see "Software Two"
-  Scenario: Show softwares one when search software one
+  Scenario: Show software "One" when searching for "Software One"
     Given I go to /search/software_infos
     And I fill in "search-input" with "Software One"
-    And I press "Search"
+    And I press "Filter"
     Then I should see "Software One"
     Then I should not see "Software Two"
+  Scenario: Show software ordered by name when "Name A-Z" is selected
+    Given I go to /search/software_infos
+    And I select "Name A-Z" from "sort"
+    And I press "Filter"
+    Then I should see "Software One" before "Software Two"
+
+  Scenario: Show software in reverse order by name when "Name Z-A" is selected
+    Given I go to /search/software_infos
+    And I select "Name Z-A" from "sort"
+    And I press "Filter"
+    Then I should see "Software Two" before "Software One"
+
+  Scenario: Show softwares with selected category in filter
+    Given I go to /search/software_infos
+    And I follow "Education"
+    Then I should see "Software Two"
+    And I should not see "Software One"
+
+
   @selenium
   Scenario: Show only "Software Two" when searching for "Education" category
     Given I go to /search/software_infos
     And I click on anything with selector "#filter-option-catalog-software"
     And I check "Education"
     Then I should see "Software Two"
-    Then I should not see "Software One"
+    And I should not see "Software One"
   @selenium
   Scenario: Show both Software "One" and "Two" when searching for "Health" category
@@ -54,4 +74,13 @@ Feature: Search software
     And I click on anything with selector "#filter-option-catalog-software"
     And I check "Health"
     Then I should see "Software One"
-    Then I should see "Software Two"
+    And I should see "Software Two"
+
+  @selenium
+  Scenario: Show not "public_software" when "Include in results" is checked
+    Given I go to /search/software_infos
+    And I click on anything with selector "#filter-option-catalog-software"
+    And I check "include_non_public"
+    Then I should see "Software One"
+    And I should see "Software Two"
+    And I should see "Software Three"
@@ -231,3 +231,7 @@ Given /^I am logged in as mpog_admin$/ do
   fill_in("Password", :with => '123456')
   click_button("Log in")
 end
+
+Given /^I should see "([^"]*)" before "([^"]*)"$/ do |before, after|
+  assert page.body.index("#{before}") < page.body.index("#{after}")
+end
@@ -66,9 +66,11 @@ class SearchController
     end
     filtered_community_list = []
-    filtered_software_list.each do |software|
-      filtered_community_list << software.community
-    end
+     filtered_software_list.each do |software|
+       if @include_non_public || software.public_software?
+         filtered_community_list << software.community
+       end
+     end
     filtered_community_list.sort!{|a, b| a.name <=> b.name}
     if params[:sort] && params[:sort] == "desc"
@@ -87,6 +89,7 @@ class SearchController
     @selected_categories = params[:selected_categories]
     @selected_categories ||= []
     @selected_categories = @selected_categories.map(&:to_i)
+    @include_non_public = params[:include_non_public] == "true"
     @message_selected_options = ""
     unless @selected_categories.empty?
@@ -88,6 +88,8 @@
     params.software_display = $("#software_display").val();
     params.sort = $("#sort").val();
+    params.include_non_public = $("#include_non_public").is(":checked");
+
     return params;
   }
@@ -17,6 +17,7 @@ module PluginTestHelper
     community = create_community(name)
     software_info = SoftwareInfo.new
     software_info.community = community
+    software_info.public_software = true
     software_info.save
     software_info
   end
@@ -23,7 +23,7 @@
         <% @categories_groupe_two.each do |category| %>
           <label>
             <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %>
-                    <%= _("#{category.name}") %>
+            <%= _("#{category.name}") %>
           </label> <br>
         <% end %>
         <br />
@@ -31,7 +31,10 @@
     </div>
   <div class="project-software"> <%= _("Software Projects:") %>
-    <label><input type="checkbox" name="filter" value="Incluir nos resultados"> <%= _("Include in results") %> </label>
+    <label>
+      <%= check_box_tag("include_non_public", true, @include_non_public) %>
+      <%= _("Include in results") %>
+    </label>
     <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">(?)</span>
   </div>
   <br />
@@ -33,7 +33,12 @@
           <ul id="categories-list">
             <% community.categories.each do |category| %>
               <li>
-                <%= category.name %>
+              <%= link_to _("#{category.name}"), {
+                :controller => :search,
+                :action => :software_infos,
+                :selected_categories => [category.id],
+                :include_non_public => !community.software_info.public_software?
+              } %>
               </li>
             <% end %>
           </ul>
	@@ -231,3 +231,7 @@ Given /^I am logged in as mpog_admin$/ do		@@ -231,3 +231,7 @@ Given /^I am logged in as mpog_admin$/ do
231	fill_in("Password", :with => '123456')	231	fill_in("Password", :with => '123456')
232	click_button("Log in")	232	click_button("Log in")
233	end	233	end
		234	+
		235	+Given /^I should see "([^"])" before "([^"])"$/ do \|before, after\|
		236	+ assert page.body.index("#{before}") < page.body.index("#{after}")
		237	+end
	@@ -88,6 +88,8 @@		@@ -88,6 +88,8 @@
88	params.software_display = $("#software_display").val();	88	params.software_display = $("#software_display").val();
89	params.sort = $("#sort").val();	89	params.sort = $("#sort").val();
90		90
		91	+ params.include_non_public = $("#include_non_public").is(":checked");
		92	+
91	return params;	93	return params;
92	}	94	}
93		95