Merge branch 'software_rating_on_catalog' into 'master'

Software rating on catalog See merge request !86

Merge branch 'software_rating_on_catalog' into 'master'
Software rating on catalog See merge request !86
Thiago Ribeiro
2 parents 83de26da 536d9288
Showing 12 changed files with 103 additions and 14 deletions Show diff stats
src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css
src/noosfero-spb/noosfero-spb-theme/images/ic-doc.png
src/noosfero-spb/software_communities/features/software_catalog.feature
src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
src/noosfero-spb/software_communities/lib/ext/search_controller.rb
src/noosfero-spb/software_communities/lib/ext/search_helper.rb
src/noosfero-spb/software_communities/lib/software_info.rb
src/noosfero-spb/software_communities/public/style.css
src/noosfero-spb/software_communities/views/search/_full_community.html.erb
src/noosfero-spb/software_communities/views/search/_software_search_form.html.erb
src/noosfero-spb/software_communities/views/shared/_organization_average_rating_block.html.erb
src/noosfero-spb/software_communities/views/shared/_software_publish_date.html.erb
@@ -53,7 +53,7 @@
     margin: 0 0 0 15px;
 }
- It's TEMPORARY 
+ It's TEMPORARY
 .action-search-software_infos #content .search-form .doubts-catalog-software {
     display: none;
 }*/
@@ -65,7 +65,7 @@
   line-height: 20px;
   position:absolute;
 }
-.action-search-software_infos .search-form label, 
+.action-search-software_infos .search-form label,
 .action-search-software_infos .search-form label{
   margin:0px 3px 4px 32px;
   line-height: 22px;
@@ -310,9 +310,9 @@
 /* Column left */
-.action-search-software_infos #search-results .search-software-item-column-left{
-  width: 130px;
-  height: 130px;
+.action-search-software_infos #search-results .search-software-item-column-left {
+  width: 140px;
+  height: 140px;
   float: left;
   border-right: 1px dotted  #ccc;
 }
@@ -359,7 +359,7 @@
 }
 .action-search-software_infos #search-results .search-software-item-column-left .extra_info {
-  width: 130px;
+  width: 140px;
   padding-right: 20px;
   top: 0px;
   position: absolute;
@@ -370,18 +370,32 @@
   opacity: inherit;
 }
-.action-search-software_infos #search-results .search-software-item-column-left .extra_info::before{
+.action-search-software_infos #search-results .search-software-item-column-left .software-date {
+  margin-top: 20px;
+  width: 130px;
+}
+
+.action-search-software_infos #search-results .search-software-item-column-left .software-date::before{
   content: url("../images/ic-calendar.png");
-  margin: 6px 10px 20px 0;
+  margin: 0px 7px 20px 0;
   float: left;
 }
+.action-search-software_infos #search-results .search-software-item-column-left .star-container.catalog_rating_block {
+  width: 140px;
+  margin-left: 0px;
+}
+
+.action-search-software_infos #search-results .search-software-item-column-left .software-date-value {
+  margin-left: 23px;
+}
+
 /* Column Right */
 .action-search-software_infos #search-results .search-software-item-column-right {
-  width: 70%;
+  width: 65%;
   float: left;
-  margin-left: 130px;
+  margin-left: 140px;
   padding: 0 0 0 8px;
   font-size: 15px;
   font-family: Arial;
@@ -439,3 +453,5 @@
   font-size: 13px;
   text-decoration: underline;
 }
+
+
@@ -80,3 +80,33 @@ Feature: Search software
     Then I should see "Software One"
     And I should see "Software Two"
     And I should see "Software Three"
+
+  @selenium
+  Scenario: See software rating on catalog
+    Given plugin "OrganizationRatings" is enabled on environment
+    And I am logged in as mpog_admin
+    And I go to /admin/plugins
+    And I check "Organization Ratings"
+    And I press "Save changes"
+    And I go to /admin/admin_panel/site_info
+    And I select "Software Público" from "environment_theme"
+    And I press "Save"
+    And I go to /account/logout
+    Given the following user
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following blocks
+      | owner         | type                      |
+      | software-two  | AverageRatingBlock        |
+      | software-two  | OrganizationRatingsBlock  |
+    And the environment domain is "localhost"
+    And I am logged in as "joaosilva"
+    And I go to /profile/software-two/plugin/organization_ratings/new_rating
+    And I press "Enviar"
+    And I go to /search/software_infos
+    When I select "Favorites" from "sort"
+    And I sleep for 3 seconds
+    Then I should see "Software Two" before "Software One"
+    And there should be 1 div with class "small-star-positive"
+    And there should be 4 divs with class "small-star-negative"
+
@@ -200,3 +200,7 @@ Given /^I keyup on selector &quot;([^&quot;]*)&quot;$/ do |selector|
   selector_founded = evaluate_script("jQuery('#{selector}').trigger('keyup').length != 0")
   selector_founded.should be_true
 end
+
+Then /^there should be (\d+) divs? with class "([^"]*)"$/ do |count, klass|
+  should have_selector("div.#{klass}", :count => count)
+end
@@ -105,6 +105,8 @@ class SearchController
       communities_list.reverse!
     elsif params[:sort] && params[:sort] == "relevance"
       communities_list = sort_by_relevance(communities_list, params[:query]){ |community| [community.software_info.finality, community.name] }
+    elsif params[:sort] && params[:sort] == "rating"
+      communities_list = sort_by_average_rating(communities_list)
     end
     communities_list
   end
@@ -30,4 +30,16 @@ module SearchHelper
     list
   end
+  def sort_by_average_rating list
+    list.sort! do |a, b|
+      rating_a = OrganizationRating.average_rating(a.id)
+      rating_a = 0 if rating_a.nil?
+      rating_b = OrganizationRating.average_rating(b.id)
+      rating_b = 0 if rating_b.nil?
+      rating_a - rating_b
+    end
+
+    list.reverse!
+  end
+
 end
@@ -91,12 +91,12 @@ class SoftwareInfo &lt; ActiveRecord::Base
   settings_items :another_license_version, :another_license_link
   # used on find_by_contents
-  scope :like_search, lambda{ |name|
+  def self.like_search name
     joins(:community).where(
       "name ILIKE ? OR acronym ILIKE ? OR finality ILIKE ?",
       "%#{name}%", "%#{name}%", "%#{name}%"
     )
-  }
+  end
   scope :search, lambda { |name="", database_description_id = "",
     programming_language_id = "", operating_system_name_id = "",
@@ -110,3 +110,6 @@
   cursor: pointer;
 }
+.catalog_rating_block {
+  margin-top: 5px;
+}
 <% software = community.software_info %>
 <li class="search-software-item">
+  <% organization_average_rating = '' %>
+  <% unless community.organization_ratings.empty?%>
+    <% organization_average_rating = render :partial => 'shared/organization_average_rating_block', :locals => {:community => community}%>
+  <% end %>
+
+  <% software_publish_date = render :partial => 'shared/software_publish_date', :locals => {:community => community, :order => @order} %>
+
   <div class="search-software-item-column-left">
-    <%= profile_image_link community, :portrait, 'div', community.send(@order + '_label') + show_date(community.created_at) %>
+    <%= profile_image_link community, :portrait, 'div', organization_average_rating + software_publish_date %>
   </div>
   <div class="search-software-item-column-right">
@@ -51,7 +51,8 @@
             [
               [_("Name A-Z"), 'asc'],
               [_("Name Z-A"), 'desc'],
-              [_("Relevance"), 'relevance']
+              [_("Relevance"), 'relevance'],
+              [_("Favorites"), 'rating']
               ], :selected=>params[:sort])
               ) %>
       </div>
@@ -0,0 +1,9 @@
+<div class="star-container catalog_rating_block">
+  <% (1..5).each do |rate_number| %>
+    <% if rate_number <= OrganizationRating.average_rating(community.id) %>
+      <div class="medium-star-positive"></div>
+    <% else %>
+      <div class="medium-star-negative"></div>
+    <% end %>
+  <% end %>
+</div>
@@ -0,0 +1,5 @@
+<span class="software-date">
+  <div class="software-date-label"><%= community.send(order + '_label') %></div>
+  <div class="software-date-value"><%= show_date(community.created_at) %></div>
+</span>
+
	@@ -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	+
	@@ -200,3 +200,7 @@ Given /^I keyup on selector "([^"]*)"$/ do \|selector\|		@@ -200,3 +200,7 @@ Given /^I keyup on selector "([^"]*)"$/ 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
	@@ -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
	@@ -91,12 +91,12 @@ class SoftwareInfo < ActiveRecord::Base		@@ -91,12 +91,12 @@ class SoftwareInfo < 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 = "",
	@@ -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	+}
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<div class="star-container catalog_rating_block">
	2	+ <% (1..5).each do \|rate_number\| %>
	3	+ <% if rate_number <= OrganizationRating.average_rating(community.id) %>
	4	+ <div class="medium-star-positive"></div>
	5	+ <% else %>
	6	+ <div class="medium-star-negative"></div>
	7	+ <% end %>
	8	+ <% end %>
	9	+</div>
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<span class="software-date">
	2	+ <div class="software-date-label"><%= community.send(order + '_label') %></div>
	3	+ <div class="software-date-value"><%= show_date(community.created_at) %></div>
	4	+</span>
	5	+