Merge branch 'r4' into 'master'

R4 See merge request !9

Merge branch 'r4' into 'master'
R4 See merge request !9
Thiago Ribeiro
2 parents f8326927 d99faa27
Showing 15 changed files with 74 additions and 68 deletions Show diff stats
db/migrate/20150701134012_add_new_fields_to_comments.rb
db/migrate/20150814185902_add_people_benefited_and_saved_value_to_create_community_rating_comment.rb
db/migrate/20150814185902_add_people_benefited_and_saved_value_to_organization_rating.rb
lib/ext/comments.rb
lib/ext/create_community_rating_comment.rb
lib/ext/organization_rating.rb
lib/software_communities_plugin.rb
views/blocks/download.html.erb
views/blocks/software_information.html.erb
views/blocks/wiki.html.erb
views/box_organizer/_statistic_block.html.erb
views/comments_extra_fields.html.erb
views/communities_ratings_extra_fields_show_data.html.erb
views/organization_ratings_extra_fields_show_data.html.erb
views/profile/index.html.erb
@@ -1,13 +0,0 @@
-class AddNewFieldsToComments < ActiveRecord::Migration
-  def self.up
-    change_table :comments do |t|
-      t.integer :people_benefited
-      t.decimal :saved_value
-    end
-  end
-
-  def self.down
-    remove_column :comments, :people_benefited
-    remove_column :comments, :saved_value
-  end
-end
@@ -1,11 +0,0 @@
-class AddPeopleBenefitedAndSavedValueToCreateCommunityRatingComment < ActiveRecord::Migration
-  def up
-    add_column :tasks, :people_benefited, :integer
-    add_column :tasks, :saved_value, :decimal
-  end
-
-  def down
-    remove_column :tasks, :people_benefited
-    remove_column :tasks, :saved_value
-  end
-end
@@ -0,0 +1,11 @@
+class AddPeopleBenefitedAndSavedValueToOrganizationRating < ActiveRecord::Migration
+  def up
+    add_column :organization_ratings, :people_benefited, :integer
+    add_column :organization_ratings, :saved_value, :decimal
+  end
+
+  def down
+    remove_column :organization_ratings, :people_benefited
+    remove_column :organization_ratings, :saved_value
+  end
+end
@@ -1,5 +0,0 @@
-require_dependency "comment"
-
-class Comment
-  attr_accessible :people_benefited, :saved_value
-end
@@ -1,5 +0,0 @@
-require_dependency "create_community_rating_comment"
-
-CreateCommunityRatingComment.class_eval do
-  attr_accessible :people_benefited, :saved_value
-end
 \ No newline at end of file
@@ -0,0 +1,5 @@
+require_dependency "organization_rating"
+
+class OrganizationRating
+  attr_accessible :people_benefited, :saved_value
+end
@@ -75,33 +75,33 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
   end
  
   module Hotspots
-    def display_community_average_rating community
+    def display_organization_average_rating organization
       nil
     end
   end
  
-  def communities_ratings_plugin_comments_extra_fields
+  def organization_ratings_plugin_comments_extra_fields
     if context.profile.software?
       Proc::new { render :file => 'comments_extra_fields' }
     end
   end
  
-  def communities_ratings_plugin_star_message
+  def organization_ratings_plugin_star_message
     Proc::new do _("Rate this software") end
   end
  
-  def communities_ratings_title
+  def organization_ratings_title
     Proc::new do "<h1 class='title'>#{_("Use reports")}</h1>" end
   end
  
-  def communities_ratings_plugin_extra_fields_show_data user_rating
+  def organization_ratings_plugin_extra_fields_show_data user_rating
     if logged_in?
       is_admin = environment.admins.include?(current_user.person)
-      is_admin ||= user_rating.community.admins.include?(current_user.person)
+      is_admin ||= user_rating.organization.admins.include?(current_user.person)
  
       if is_admin and context.profile.software?
         Proc::new {
-          render :file => 'communities_ratings_extra_fields_show_data',
+          render :file => 'organization_ratings_extra_fields_show_data',
                  :locals => {:user_rating => user_rating}
         }
       end
@@ -4,19 +4,12 @@
     <h3 class="block-title"> <%= _("Download #{block.owner.software_info.community.name}") %> </h3>
     <ul class="download-list">
     <% block.downloads.each_with_index do |download, index| %>
-        <div id="download-info-<%=(index+1)%>">
-          <div id="version01">
+      <li id="download-item-<%=(index+1)%>">
+        <div class="download-button">
           <%= link_to :controller => 'software_communities_plugin_profile', :action=> 'download_file', :block=>block.id, :download_index=> index , title: _("Download the software") do %>
-              <span id="image-download"></span>
-              <span id="size-download"><%= download[:size] %></span>
-            <% end %>
-          </div>
-
-          <div id="info-software-download">
-            <span class="download-name"><%= _("#{download[:name]}") %></span>
-            <span class="download-system"><%= _("Platform:#{download[:software_description]}") %> </span>
-            <span class="req_min_spb"><%= link_to _("Minimum Requirements"), download[:minimum_requirements] %></span>
-          </div>
+          <span class="download-image"></span>
+          <span class="download-size"><%= download[:size] %></span>
+          <% end %>
         </div>
         <div class="download-info">
           <span class="download-name"><%= _("#{download[:name]}") %></span>
@@ -12,7 +12,7 @@
               <%= link_to profile_image(block.owner, :big) +"\n", profile.url %>
             </span>
             <div class='admin-link'>
-              <% if current_user && block.owner.admins.include?(current_user.person) %>
+              <% if !user.nil? && user.has_permission?('edit_profile', profile) %>
                 <%= link_to _('Control panel'), block.owner.admin_url %>
               <% end %>
             </div>
@@ -28,7 +28,7 @@
           <%= block.owner.software_info.finality %>
         </b>
  
-        <%= @plugins.dispatch(:display_community_average_rating, block.owner).collect { |content| instance_exec(&content) }.join("") %>
+        <%= @plugins.dispatch(:display_organization_average_rating, block.owner).collect { |content| instance_exec(&content) }.join("") %>
       </td>
     </tr>
   </table>
 <% if block.owner.software_info.nil? %>
   <%= _("This community needs a software to use this block") %>
 <% else %>
-  <%= link_to _("Wiki") , block.wiki_link, :id => "bt_repositorio", :target => "_blank" %>
+  <%= link_to _("Wiki") , block.wiki_link, :id => "bt_wiki", :target => "_blank" %>
 <% end %>
  
 <div id='edit-softwares-block'>
+  <% suggestion_benefited_people = @block.owner.organization_ratings.collect{ |r| r.people_benefited.to_f }.inject(:+) || 0.0 %>
+  <% suggestion_saved_resources = @block.owner.organization_ratings.collect{ |r| r.saved_value.to_f }.inject(:+) || 0.0 %>
+
   <%= labelled_form_field _('Benefited People'), text_field(:block, :benefited_people) %>
+  <p> <%= _("Portal suggested value: ") %> <span> <%= "%d" % (suggestion_benefited_people) %> <span> </p>
   <%= labelled_form_field _('Saved Resources'), text_field(:block, :saved_resources) %>
+  <p> <%= _("Portal suggested value: ") %> <span> <%= "R$%.2f" % (suggestion_saved_resources) %> <span> </p>
 </div>
  
@@ -10,12 +10,12 @@
   <div class="comments-software-people-benefited">
     <%= label_tag "comments_people_benefited", _("Number of Beneficiaries")%>
     <span class="star-tooltip" title="Quantidade de pessoas beneficiadas com a utilização do software"></span>
-    <%= text_field_tag "comments[people_benefited]", "" %>
+    <%= text_field_tag "organization_rating[people_benefited]", "" %>
   </div>
  
   <div class="comments-software-saved-values">
     <%= label_tag "comments_saved_value", _("Saved resources")%>
     <span class="star-tooltip" title="Valores em “Real” economizados com a utilização do software"></span>
-    <%= text_field_tag "comments[saved_value]", "", :placeholder=>"R$"%>
+    <%= text_field_tag "organization_rating[saved_value]", "", :placeholder=>"R$"%>
   </div>
 </div>
@@ -1,10 +0,0 @@
-<div class="aditional-informations">
-  <div class="comments-people-benefited">
-    <span>People benefited :</span> <%= user_rating.comment.people_benefited unless user_rating.comment.nil? %>
-  </div>
-
-  <div class="comments-saved-value">
-    <span>Saved Value :</span> <%= user_rating.comment.saved_value unless user_rating.comment.nil? %>
-  </div>
-</div>
-
@@ -0,0 +1,10 @@
+<div class="aditional-informations">
+  <div class="comments-people-benefited">
+    <span>People benefited :</span> <%= user_rating.people_benefited unless user_rating.nil? %>
+  </div>
+
+  <div class="comments-saved-value">
+    <span>Saved Value :</span> <%= user_rating.saved_value unless user_rating.nil? %>
+  </div>
+</div>
+
@@ -0,0 +1,26 @@
+<h1><%= h profile.name %></h1>
+
+<% if @action %>
+  <%= render :partial => 'private_profile' %>
+<% else %>
+  <% unless profile.description.blank? %>
+    <div class='public-profile-description'>
+      <%= profile.description %>
+    </div>
+  <% end %>
+<% end %>
+
+<div class="page-profile-header">
+  <%= render "blocks/profile_info_actions/join_leave_community" %>
+  <% if !user.nil? && user.has_permission?('edit_profile', profile) %>
+    <div class="control-panel-button">
+      <%= button :control_panel, _('Control Panel'), profile.admin_url %>
+    </div>
+  <% end %>
+</div>
+
+<% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
+  <table class='profile'>
+
+  </table>
+<% end %>
...	...	@@ -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
...	...	@@ -1,11 +0,0 @@
1		-class AddPeopleBenefitedAndSavedValueToCreateCommunityRatingComment < ActiveRecord::Migration
2		- def up
3		- add_column :tasks, :people_benefited, :integer
4		- add_column :tasks, :saved_value, :decimal
5		- end
6		-
7		- def down
8		- remove_column :tasks, :people_benefited
9		- remove_column :tasks, :saved_value
10		- end
11		-end
...	...	@@ -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
...	...
...	...	@@ -1,5 +0,0 @@
1		-require_dependency "comment"
2		-
3		-class Comment
4		- attr_accessible :people_benefited, :saved_value
5		-end
...	...	@@ -1,5 +0,0 @@
1		-require_dependency "create_community_rating_comment"
2		-
3		-CreateCommunityRatingComment.class_eval do
4		- attr_accessible :people_benefited, :saved_value
5		-end
6	0	\ No newline at end of file
...	...	@@ -0,0 +1,5 @@
	1	+require_dependency "organization_rating"
	2	+
	3	+class OrganizationRating
	4	+ attr_accessible :people_benefited, :saved_value
	5	+end
...	...
...	...	@@ -75,33 +75,33 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin
75	75	end
76	76
77	77	module Hotspots
78		- def display_community_average_rating community
	78	+ def display_organization_average_rating organization
79	79	nil
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
...	...
...	...	@@ -4,19 +4,12 @@
4	4	<h3 class="block-title"> <%= _("Download #{block.owner.software_info.community.name}") %> </h3>
5	5	<ul class="download-list">
6	6	<% block.downloads.each_with_index do \|download, index\| %>
7		- <div id="download-info-<%=(index+1)%>">
8		- <div id="version01">
	7	+ <li id="download-item-<%=(index+1)%>">
	8	+ <div class="download-button">
9	9	<%= link_to :controller => 'software_communities_plugin_profile', :action=> 'download_file', :block=>block.id, :download_index=> index , title: _("Download the software") do %>
10		- <span id="image-download"></span>
11		- <span id="size-download"><%= download[:size] %></span>
12		- <% end %>
13		- </div>
14		-
15		- <div id="info-software-download">
16		- <span class="download-name"><%= _("#{download[:name]}") %></span>
17		- <span class="download-system"><%= _("Platform:#{download[:software_description]}") %> </span>
18		- <span class="req_min_spb"><%= link_to _("Minimum Requirements"), download[:minimum_requirements] %></span>
19		- </div>
	10	+ <span class="download-image"></span>
	11	+ <span class="download-size"><%= download[:size] %></span>
	12	+ <% end %>
20	13	</div>
21	14	<div class="download-info">
22	15	<span class="download-name"><%= _("#{download[:name]}") %></span>
...	...
...	...	@@ -12,7 +12,7 @@
12	12	<%= link_to profile_image(block.owner, :big) +"\n", profile.url %>
13	13	</span>
14	14	<div class='admin-link'>
15		- <% if current_user && block.owner.admins.include?(current_user.person) %>
	15	+ <% if !user.nil? && user.has_permission?('edit_profile', profile) %>
16	16	<%= link_to _('Control panel'), block.owner.admin_url %>
17	17	<% end %>
18	18	</div>
...	...	@@ -28,7 +28,7 @@
28	28	<%= block.owner.software_info.finality %>
29	29	</b>
30	30
31		- <%= @plugins.dispatch(:display_community_average_rating, block.owner).collect { \|content\| instance_exec(&content) }.join("") %>
	31	+ <%= @plugins.dispatch(:display_organization_average_rating, block.owner).collect { \|content\| instance_exec(&content) }.join("") %>
32	32	</td>
33	33	</tr>
34	34	</table>
...	...
1	1	<% if block.owner.software_info.nil? %>
2	2	<%= _("This community needs a software to use this block") %>
3	3	<% else %>
4		- <%= link_to _("Wiki") , block.wiki_link, :id => "bt_repositorio", :target => "_blank" %>
	4	+ <%= link_to _("Wiki") , block.wiki_link, :id => "bt_wiki", :target => "_blank" %>
5	5	<% end %>
6	6
...	...