Commit 5a167ead35303a66224768d8be6626601844fea9
1 parent
da776202
Exists in
master
and in
5 other branches
Refactoring PLugin to fit new Ratings Structure
Showing
11 changed files
with
36 additions
and
54 deletions
Show diff stats
db/migrate/20150701134012_add_new_fields_to_comments.rb
... | ... | @@ -1,13 +0,0 @@ |
1 | -class AddNewFieldsToComments < ActiveRecord::Migration | |
2 | - def self.up | |
3 | - change_table :comments do |t| | |
4 | - t.integer :people_benefited | |
5 | - t.decimal :saved_value | |
6 | - end | |
7 | - end | |
8 | - | |
9 | - def self.down | |
10 | - remove_column :comments, :people_benefited | |
11 | - remove_column :comments, :saved_value | |
12 | - end | |
13 | -end |
db/migrate/20150814185902_add_people_benefited_and_saved_value_to_create_community_rating.rb
... | ... | @@ -1,11 +0,0 @@ |
1 | -class AddPeopleBenefitedAndSavedValueToCreateCommunityRating < ActiveRecord::Migration | |
2 | - def up | |
3 | - add_column :community_ratings, :people_benefited, :integer | |
4 | - add_column :community_ratings, :saved_value, :decimal | |
5 | - end | |
6 | - | |
7 | - def down | |
8 | - remove_column :community_ratings, :people_benefited | |
9 | - remove_column :community_ratings, :saved_value | |
10 | - end | |
11 | -end |
db/migrate/20150814185902_add_people_benefited_and_saved_value_to_organization_rating.rb
0 → 100644
... | ... | @@ -0,0 +1,11 @@ |
1 | +class AddPeopleBenefitedAndSavedValueToOrganizationRating < ActiveRecord::Migration | |
2 | + def up | |
3 | + add_column :organization_ratings, :people_benefited, :integer | |
4 | + add_column :organization_ratings, :saved_value, :decimal | |
5 | + end | |
6 | + | |
7 | + def down | |
8 | + remove_column :organization_ratings, :people_benefited | |
9 | + remove_column :organization_ratings, :saved_value | |
10 | + end | |
11 | +end | ... | ... |
lib/ext/community_rating.rb
lib/ext/create_community_rating_comment.rb
lib/software_communities_plugin.rb
... | ... | @@ -80,28 +80,28 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin |
80 | 80 | end |
81 | 81 | end |
82 | 82 | |
83 | - def communities_ratings_plugin_comments_extra_fields | |
83 | + def organization_ratings_plugin_comments_extra_fields | |
84 | 84 | if context.profile.software? |
85 | 85 | Proc::new { render :file => 'comments_extra_fields' } |
86 | 86 | end |
87 | 87 | end |
88 | 88 | |
89 | - def communities_ratings_plugin_star_message | |
89 | + def organization_ratings_plugin_star_message | |
90 | 90 | Proc::new do _("Rate this software") end |
91 | 91 | end |
92 | 92 | |
93 | - def communities_ratings_title | |
93 | + def organization_ratings_title | |
94 | 94 | Proc::new do "<h1 class='title'>#{_("Use reports")}</h1>" end |
95 | 95 | end |
96 | 96 | |
97 | - def communities_ratings_plugin_extra_fields_show_data user_rating | |
97 | + def organization_ratings_plugin_extra_fields_show_data user_rating | |
98 | 98 | if logged_in? |
99 | 99 | is_admin = environment.admins.include?(current_user.person) |
100 | - is_admin ||= user_rating.community.admins.include?(current_user.person) | |
100 | + is_admin ||= user_rating.organization.admins.include?(current_user.person) | |
101 | 101 | |
102 | 102 | if is_admin and context.profile.software? |
103 | 103 | Proc::new { |
104 | - render :file => 'communities_ratings_extra_fields_show_data', | |
104 | + render :file => 'organization_ratings_extra_fields_show_data', | |
105 | 105 | :locals => {:user_rating => user_rating} |
106 | 106 | } |
107 | 107 | end | ... | ... |
views/box_organizer/_statistic_block.html.erb
1 | 1 | <div id='edit-softwares-block'> |
2 | - <% suggestion_benefited_people = @block.owner.community_ratings.collect{|community_rating| community_rating.people_benefited.to_f}.inject(:+) || 0.0 %> | |
3 | - <% suggestion_saved_resources = @block.owner.community_ratings.collect{|community_rating| community_rating.saved_value.to_f}.inject(:+) || 0.0 %> | |
2 | + <% suggestion_benefited_people = @block.owner.organization_ratings.collect{ |r| r.people_benefited.to_f }.inject(:+) || 0.0 %> | |
3 | + <% suggestion_saved_resources = @block.owner.organization_ratings.collect{ |r| r.saved_value.to_f }.inject(:+) || 0.0 %> | |
4 | 4 | |
5 | 5 | <%= labelled_form_field _('Benefited People'), text_field(:block, :benefited_people) %> |
6 | 6 | <p> <%= _("Portal suggested value: ") %> <span> <%= "%d" % (suggestion_benefited_people) %> <span> </p> | ... | ... |
views/comments_extra_fields.html.erb
... | ... | @@ -10,12 +10,12 @@ |
10 | 10 | <div class="comments-software-people-benefited"> |
11 | 11 | <%= label_tag "comments_people_benefited", _("Number of Beneficiaries")%> |
12 | 12 | <span class="star-tooltip" title="Quantidade de pessoas beneficiadas com a utilização do software"></span> |
13 | - <%= text_field_tag "community_rating[people_benefited]", "" %> | |
13 | + <%= text_field_tag "organization_rating[people_benefited]", "" %> | |
14 | 14 | </div> |
15 | 15 | |
16 | 16 | <div class="comments-software-saved-values"> |
17 | 17 | <%= label_tag "comments_saved_value", _("Saved resources")%> |
18 | 18 | <span class="star-tooltip" title="Valores em “Real” economizados com a utilização do software"></span> |
19 | - <%= text_field_tag "community_rating[saved_value]", "", :placeholder=>"R$"%> | |
19 | + <%= text_field_tag "organization_rating[saved_value]", "", :placeholder=>"R$"%> | |
20 | 20 | </div> |
21 | 21 | </div> | ... | ... |
views/communities_ratings_extra_fields_show_data.html.erb
... | ... | @@ -1,10 +0,0 @@ |
1 | -<div class="aditional-informations"> | |
2 | - <div class="comments-people-benefited"> | |
3 | - <span>People benefited :</span> <%= user_rating.people_benefited unless user_rating.nil? %> | |
4 | - </div> | |
5 | - | |
6 | - <div class="comments-saved-value"> | |
7 | - <span>Saved Value :</span> <%= user_rating.saved_value unless user_rating.nil? %> | |
8 | - </div> | |
9 | -</div> | |
10 | - |
views/organization_ratings_extra_fields_show_data.html.erb
0 → 100644
... | ... | @@ -0,0 +1,10 @@ |
1 | +<div class="aditional-informations"> | |
2 | + <div class="comments-people-benefited"> | |
3 | + <span>People benefited :</span> <%= user_rating.people_benefited unless user_rating.nil? %> | |
4 | + </div> | |
5 | + | |
6 | + <div class="comments-saved-value"> | |
7 | + <span>Saved Value :</span> <%= user_rating.saved_value unless user_rating.nil? %> | |
8 | + </div> | |
9 | +</div> | |
10 | + | ... | ... |