Download as
Browse Code »

Commit 6f2cc74ea7def2454531baebab64f1a4127150f9

Authored by Marcos Pereira
Committed by Thiago Ribeiro
1 parent c896d5f4
Exists in master and in 51 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, review_message, signals_user_noosfero, sisp_catalog_header, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_softwares_boxes

Add rating and favorite filter to software catalog 

Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 11 changed files with 77 additions and 4 deletions   Show diff stats
src/noosfero-spb/noosfero-spb-theme/images/ic-doc.png 0 → 100644
View file @6f2cc74

268 Bytes
src/noosfero-spb/software_communities/features/software_catalog.feature
  Diff comments   View file @6f2cc74
@@ -80,3 +80,33 @@ Feature: Search software @@ -80,3 +80,33 @@ Feature: Search software
80 Then I should see "Software One" 80 Then I should see "Software One"
81 And I should see "Software Two" 81 And I should see "Software Two"
82 And I should see "Software Three" 82 And I should see "Software Three"
  83 +
  84 + @selenium
  85 + Scenario: See software rating on catalog
  86 + Given plugin "OrganizationRatings" is enabled on environment
  87 + And I am logged in as mpog_admin
  88 + And I go to /admin/plugins
  89 + And I check "Organization Ratings"
  90 + And I press "Save changes"
  91 + And I go to /admin/admin_panel/site_info
  92 + And I select "Software Público" from "environment_theme"
  93 + And I press "Save"
  94 + And I go to /account/logout
  95 + Given the following user
  96 + | login | name |
  97 + | joaosilva | Joao Silva |
  98 + And the following blocks
  99 + | owner | type |
  100 + | software-two | AverageRatingBlock |
  101 + | software-two | OrganizationRatingsBlock |
  102 + And the environment domain is "localhost"
  103 + And I am logged in as "joaosilva"
  104 + And I go to /profile/software-two/plugin/organization_ratings/new_rating
  105 + And I press "Enviar"
  106 + And I go to /search/software_infos
  107 + When I select "Favorites" from "sort"
  108 + And I sleep for 3 seconds
  109 + Then I should see "Software Two" before "Software One"
  110 + And there should be 1 div with class "small-star-positive"
  111 + And there should be 4 divs with class "small-star-negative"
  112 +
src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
  Diff comments   View file @6f2cc74
@@ -200,3 +200,7 @@ Given /^I keyup on selector &quot;([^&quot;]*)&quot;$/ do |selector| @@ -200,3 +200,7 @@ Given /^I keyup on selector &quot;([^&quot;]*)&quot;$/ do |selector|
200 selector_founded = evaluate_script("jQuery('#{selector}').trigger('keyup').length != 0") 200 selector_founded = evaluate_script("jQuery('#{selector}').trigger('keyup').length != 0")
201 selector_founded.should be_true 201 selector_founded.should be_true
202 end 202 end
  203 +
  204 +Then /^there should be (\d+) divs? with class "([^"]*)"$/ do |count, klass|
  205 + should have_selector("div.#{klass}", :count => count)
  206 +end
src/noosfero-spb/software_communities/lib/ext/search_controller.rb
  Diff comments   View file @6f2cc74
@@ -105,6 +105,8 @@ class SearchController @@ -105,6 +105,8 @@ class SearchController
105 communities_list.reverse! 105 communities_list.reverse!
106 elsif params[:sort] && params[:sort] == "relevance" 106 elsif params[:sort] && params[:sort] == "relevance"
107 communities_list = sort_by_relevance(communities_list, params[:query]){ |community| [community.software_info.finality, community.name] } 107 communities_list = sort_by_relevance(communities_list, params[:query]){ |community| [community.software_info.finality, community.name] }
  108 + elsif params[:sort] && params[:sort] == "rating"
  109 + communities_list = sort_by_average_rating(communities_list)
108 end 110 end
109 communities_list 111 communities_list
110 end 112 end
src/noosfero-spb/software_communities/lib/ext/search_helper.rb
  Diff comments   View file @6f2cc74
@@ -30,4 +30,16 @@ module SearchHelper @@ -30,4 +30,16 @@ module SearchHelper
30 list 30 list
31 end 31 end
32 32
  33 + def sort_by_average_rating list
  34 + list.sort! do |a, b|
  35 + rating_a = OrganizationRating.average_rating(a.id)
  36 + rating_a = 0 if rating_a.nil?
  37 + rating_b = OrganizationRating.average_rating(b.id)
  38 + rating_b = 0 if rating_b.nil?
  39 + rating_a - rating_b
  40 + end
  41 +
  42 + list.reverse!
  43 + end
  44 +
33 end 45 end
src/noosfero-spb/software_communities/lib/software_info.rb
  Diff comments   View file @6f2cc74
@@ -91,12 +91,12 @@ class SoftwareInfo &lt; ActiveRecord::Base @@ -91,12 +91,12 @@ class SoftwareInfo &lt; ActiveRecord::Base
91 settings_items :another_license_version, :another_license_link 91 settings_items :another_license_version, :another_license_link
92 92
93 # used on find_by_contents 93 # used on find_by_contents
94 - scope :like_search, lambda{ |name| 94 + def self.like_search name
95 joins(:community).where( 95 joins(:community).where(
96 "name ILIKE ? OR acronym ILIKE ? OR finality ILIKE ?", 96 "name ILIKE ? OR acronym ILIKE ? OR finality ILIKE ?",
97 "%#{name}%", "%#{name}%", "%#{name}%" 97 "%#{name}%", "%#{name}%", "%#{name}%"
98 ) 98 )
99 - } 99 + end
100 100
101 scope :search, lambda { |name="", database_description_id = "", 101 scope :search, lambda { |name="", database_description_id = "",
102 programming_language_id = "", operating_system_name_id = "", 102 programming_language_id = "", operating_system_name_id = "",
src/noosfero-spb/software_communities/public/style.css
  Diff comments   View file @6f2cc74
@@ -110,3 +110,6 @@ @@ -110,3 +110,6 @@
110 cursor: pointer; 110 cursor: pointer;
111 } 111 }
112 112
  113 +.catalog_rating_block {
  114 + margin-top: 5px;
  115 +}
src/noosfero-spb/software_communities/views/search/_full_community.html.erb
  Diff comments   View file @6f2cc74
1 <% software = community.software_info %> 1 <% software = community.software_info %>
2 <li class="search-software-item"> 2 <li class="search-software-item">
  3 + <% organization_average_rating = '' %>
  4 + <% unless community.organization_ratings.empty?%>
  5 + <% organization_average_rating = render :partial => 'shared/organization_average_rating_block', :locals => {:community => community}%>
  6 + <% end %>
  7 +
  8 + <% software_publish_date = render :partial => 'shared/software_publish_date', :locals => {:community => community, :order => @order} %>
  9 +
3 <div class="search-software-item-column-left"> 10 <div class="search-software-item-column-left">
4 - <%= profile_image_link community, :portrait, 'div', community.send(@order + '_label') + show_date(community.created_at) %> 11 + <%= profile_image_link community, :portrait, 'div', organization_average_rating + software_publish_date %>
5 </div> 12 </div>
6 13
7 <div class="search-software-item-column-right"> 14 <div class="search-software-item-column-right">
src/noosfero-spb/software_communities/views/search/_software_search_form.html.erb
  Diff comments   View file @6f2cc74
@@ -51,7 +51,8 @@ @@ -51,7 +51,8 @@
51 [ 51 [
52 [_("Name A-Z"), 'asc'], 52 [_("Name A-Z"), 'asc'],
53 [_("Name Z-A"), 'desc'], 53 [_("Name Z-A"), 'desc'],
54 - [_("Relevance"), 'relevance'] 54 + [_("Relevance"), 'relevance'],
  55 + [_("Favorites"), 'rating']
55 ], :selected=>params[:sort]) 56 ], :selected=>params[:sort])
56 ) %> 57 ) %>
57 </div> 58 </div>
src/noosfero-spb/software_communities/views/shared/_organization_average_rating_block.html.erb 0 → 100644
  Diff comments   View file @6f2cc74
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
  1 +<span class="average-rating-title"><%= _("Rating") %></span>
  2 +<div class="star-container catalog_rating_block">
  3 + <% (1..5).each do |rate_number| %>
  4 + <% if rate_number <= OrganizationRating.average_rating(community.id) %>
  5 + <div class="small-star-positive"></div>
  6 + <% else %>
  7 + <div class="small-star-negative"></div>
  8 + <% end %>
  9 + <% end %>
  10 +</div>
src/noosfero-spb/software_communities/views/shared/_software_publish_date.html.erb 0 → 100644
  Diff comments   View file @6f2cc74
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +<span class="software-date">
  2 + <%= community.send(order + '_label') %>
  3 + <%= show_date(community.created_at) %>
  4 +</span>