Gabriel Silva · Daniela Feitosa · Daniela Feitosa · Dylan Guedes · Gabriel Silva · Gabriel Silva
Showing 60 changed files Show diff stats
src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb
src/noosfero-spb/gov_user/controllers/gov_user_plugin_myprofile_controller.rb
src/noosfero-spb/gov_user/features/rate_community.feature
src/noosfero-spb/gov_user/lib/gov_user_plugin.rb
src/noosfero-spb/gov_user/lib/institution.rb
src/noosfero-spb/gov_user/test/functional/gov_user_plugin_controller_test.rb
src/noosfero-spb/gov_user/test/functional/profile_editor_controller_test.rb
src/noosfero-spb/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb
src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb
src/noosfero-spb/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb
src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
src/noosfero-spb/software_communities/controllers/software_communities_plugin_myprofile_controller.rb
src/noosfero-spb/software_communities/db/migrate/20151116134125_add_statistics_to_software_info.rb
src/noosfero-spb/software_communities/db/migrate/20151116140329_move_software_statistics_from_block_to_software_info.rb
src/noosfero-spb/software_communities/features/software_block.feature
src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
src/noosfero-spb/software_communities/lib/ext/application_helper.rb
src/noosfero-spb/software_communities/lib/ext/community.rb
src/noosfero-spb/software_communities/lib/ext/create_organization_rating_comment.rb
src/noosfero-spb/software_communities/lib/software_communities_plugin.rb
@@ -111,7 +111,7 @@ class GovUserPluginController &lt; ApplicationController
     params[:community] ||= {}
     params[:institutions] ||= {}
  
-    @show_sisp_field = environment.admins.include?(current_user.person)
+    @show_sisp_field = user.is_admin?
     @governmental_sphere = get_governmental_spheres()
     @governmental_power = get_governmental_powers()
     @juridical_nature = get_juridical_natures()
@@ -209,7 +209,7 @@ class GovUserPluginController &lt; ApplicationController
  
   def add_environment_admins_to_institution institution
     edit_page = params[:edit_institution_page] == false
-    if environment.admins.include?(current_user.person) && edit_page
+    if user.is_admin? && edit_page
       environment.admins.each do |adm|
         institution.community.add_admin(adm)
       end
@@ -5,7 +5,7 @@ class GovUserPluginMyprofileController &lt; MyProfileController
   end
  
   def edit_institution
-    @show_sisp_field = environment.admins.include?(current_user.person)
+    @show_sisp_field = user.is_admin?
     @state_list = NationalRegion.find(
                     :all,
                     :conditions => { :national_region_type_id => 2 },
@@ -0,0 +1,61 @@
+Feature: rate_community
+  As an admin
+  I want to see a warning in the task if a software already has a rating related to an specific institution
+  So it will be clear when the saved value will be updated
+
+  Background:
+    Given the environment domain is "localhost"
+    And "OrganizationRatings" plugin is enabled
+    And "SoftwareCommunities" plugin is enabled
+    And "GovUser" plugin is enabled
+    And I am logged in as mpog_admin
+    And I go to /admin/plugins
+    And I check "Organization Ratings"
+    And I check "GovUserPlugin"
+    And I check "SoftwareCommunitiesPlugin"
+    And I press "Save changes"
+    And the following user
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following softwares
+      | name        | public_software | finality                |
+      | mycommunity | true            | basic software finality |
+      | anothercommunity | true            | basic software finality |
+    And the following blocks
+      | owner       | type                |
+      | mycommunity | OrganizationRatingsBlock  |
+    And Institutions has initial default values on database
+    And the following public institutions
+      | name                       | acronym | country | state | city       | cnpj               | juridical_nature | governmental_power | governmental_sphere | corporate_name |
+      | Ministerio das Cidades     | MC      | BR      | DF    | Gama       | 58.745.189/0001-21 | Autarquia        | Executivo          | Federal             | Ministerio das Cidades |
+      | Ministerio do Planejamento | MP      | BR      | DF    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
+
+  Scenario: display message on task when a rating with the same institution exists on the same software
+    Given the following organization ratings
+      | value | organization_name | user_login | institution_name       | task_status |
+      | 5     | mycommunity       | joaosilva  | Ministerio das Cidades | 3           |
+      | 4     | mycommunity       | joaosilva  | Ministerio das Cidades | 1           |
+    And I go to mycommunity's control panel
+    And I follow "Process requests" within ".pending-tasks"
+    And I choose "Accept" within ".task_decisions"
+    Then I should see "This instiution already has an accepted rating" in the page
+
+  Scenario: do not display message on task when a rating with the same institution does not exist on the same software
+    Given the following organization ratings
+      | value | organization_name | user_login | institution_name           | task_status |
+      | 5     | mycommunity       | joaosilva  | Ministerio das Cidades     | 3           |
+      | 4     | mycommunity       | joaosilva  | Ministerio do Planejamento | 1           |
+    And I go to mycommunity's control panel
+    And I follow "Process requests" within ".pending-tasks"
+    And I choose "Accept" within ".task_decisions"
+    Then I should not see "This instiution already has an accepted rating" within ".task_box"
+
+  Scenario: do not display message on task when a rating with the same institution exist on different softwares
+    Given the following organization ratings
+      | value | organization_name | user_login | institution_name       | task_status |
+      | 5     | mycommunity       | joaosilva  | Ministerio das Cidades | 3           |
+      | 4     | anothercommunity  | joaosilva  | Ministerio das Cidades | 1           |
+    And I go to anothercommunity's control panel
+    And I follow "Process requests" within ".pending-tasks"
+    And I choose "Accept" within ".task_decisions"
+    Then I should not see "This instiution already has an accepted rating" within ".task_box"
@@ -54,9 +54,7 @@ class GovUserPlugin &lt; Noosfero::Plugin
   def profile_editor_controller_filters
     block = proc do
       if request.post? && params[:institution]
-        is_admin = environment.admins.include?(current_user.person)
-
-        unless is_admin
+        unless user.is_admin?
           institution = profile.user.institutions
  
           if !params[:institution].blank? && params[:institution].class == Hash && !params[:institution][:sisp].nil?
@@ -241,16 +239,30 @@ class GovUserPlugin &lt; Noosfero::Plugin
     Proc::new do render :file => 'ratings_extra_field' end
   end
  
-  def organization_ratings_plugin_extra_fields_show_data user_rating
+  def organization_ratings_plugin_task_extra_fields user_rating
+    gov_user_self = self
+
+    Proc::new {
+      if logged_in?
+        is_admin = user.is_admin? || user_rating.organization.is_admin?(user)
+
+        if is_admin and gov_user_self.context.profile.software?
+            render :file => 'organization_ratings_task_extra_fields_show_institution',
+                   :locals => {:user_rating => user_rating}
+        end
+      end
+    }
+  end
+
+  def organization_ratings_plugin_container_extra_fields user_rating
     gov_user_self = self
  
     Proc::new {
       if logged_in?
-        is_admin = environment.admins.include?(current_user.person)
-        is_admin ||= user_rating.organization.admins.include?(current_user.person)
+        is_admin = user.is_admin? || user_rating.organization.is_admin?(user)
  
         if is_admin and gov_user_self.context.profile.software?
-            render :file => 'organization_ratings_extra_fields_show_institution',
+            render :file => 'organization_ratings_container_extra_fields_show_institution',
                    :locals => {:user_rating => user_rating}
         end
       end
@@ -36,6 +36,14 @@ class Institution &lt; ActiveRecord::Base
            :verify_institution_type, :validate_format_cnpj
  
  
+  def has_accepted_rating? user_rating
+    rating_ids = OrganizationRating.where(institution_id: self.id, organization_id: user_rating.organization_id).map(&:id)
+    finished_tasks = CreateOrganizationRatingComment.finished.select {|task| rating_ids.include?(task.organization_rating_id)}
+    pending_tasks = CreateOrganizationRatingComment.pending.select{|c| c.organization_rating_id == user_rating.id}
+
+    !finished_tasks.empty? && !pending_tasks.empty?
+  end
+
   protected
  
   def verify_institution_type
@@ -230,7 +230,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields[:edit_institution_page] = false
     post :new_institution, fields
  
-    assert(Institution.last.community.admins.include?(admin2) )
+    assert(Institution.last.community.is_admin?(admin2) )
   end
  
 end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/institution_test_helper'
 require(
 File.dirname(__FILE__) +
@@ -0,0 +1,7 @@
+<% if user_rating.institution %>
+<div class="aditional-informations">
+  <div class="comments-user-institution">
+    <span><%=_("Institution")%> :</span> <%= user_rating.institution.name %>
+  </div>
+</div>
+<% end %>
@@ -0,0 +1,13 @@
+<% if user_rating.institution %>
+<div class="aditional-informations">
+  <div class="comments-user-institution">
+    <span><%=_("Institution")%> :</span> <%= user_rating.institution.name %>
+  </div>
+
+  <% if user_rating.institution.has_accepted_rating?(user_rating) %>
+    <div class="">
+       <span><%=_("This instiution already has an accepted rating. Accepting it will automatically update the saved value.") %></span>
+    </div>
+  <% end %>
+</div>
+<% end %>
@@ -630,3 +630,107 @@
 }
  
 /*** end fo software internal pages ***/
+
+/*** organization-rating review page (tasks of software) ***/
+
+.task-list .task_boxes{
+  font-family: Arial;
+}
+
+.task-list .task_boxes .task_box .task_date{
+  position: absolute;
+  left: 80px;
+}
+
+.task_boxes .task_box .task_title{
+  position: absolute;
+  left: 80px;
+  font-weight: 500;
+  margin-top: 10px;
+}
+
+.task_boxes .task_box .task_responsible{
+  text-align: right;
+}
+
+.task_boxes .task_box .task_responsible span select{
+  padding: 4px 15px 1px 4px;
+}
+
+.task_boxes .task_box .task_decisions{
+  float: right;
+  padding-right: 5px;
+}
+
+.task_boxes .task_box .task_information{
+  margin-top: 40px;
+  font-size: 13px;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited{
+  float: left;
+  font-weight: 900;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value{
+  font-weight: 900;
+  margin-left: 160px;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .aditional-informations{
+  margin-top: 10px;
+  margin-bottom: 10px;
+  border-bottom: 1px solid #CDCDCD;
+  padding-bottom: 15px;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-user-institution span span{
+  font-weight: 900;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited span{
+  font-weight: 100;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value span{
+  font-weight: 100;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .task-comment span{
+  font-weight: 600;
+  color: rgb(140, 140, 140);
+  font-size: 11px;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .task-comment{
+  margin-bottom: 15px;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .task-comment span p{
+  font-weight: 100;
+  font-size: 12px;
+  color: black;
+  line-height: 16px;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .task-comment{
+  line-height: 25px;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .rating-notice{
+  display: block;
+  color: #F11467;
+  padding: 5px 5px;
+  background: #ccc;
+}
+
+.task_boxes .task_box .organization-rating-comment-body .task-star-container{
+  margin-bottom: 30px;
+  margin-top: 10px;
+}
+
+.action-tasks-index .task_box{
+  padding: 10px;
+}
+
+/*** end of organization-rating review page (tasks of software) ***/
@@ -144,7 +144,7 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
  
     add_admin_to_community
  
-    if !environment.admins.include?(current_user.person)
+    if  !user.is_admin?
       session[:notice] = _('Your new software request will be evaluated by an'\
                            'administrator. You will be notified.')
       redirect_to user.admin_url
@@ -0,0 +1,11 @@
+class AddStatisticsToSoftwareInfo < ActiveRecord::Migration
+  def up
+    add_column :software_infos, :benefited_people, :integer, :default => 0
+    add_column :software_infos, :saved_resources, :decimal, :default => 0
+  end
+
+  def down
+    remove_column :software_infos, :benefited_people
+    remove_column :software_infos, :saved_resources
+  end
+end
@@ -0,0 +1,19 @@
+class MoveSoftwareStatisticsFromBlockToSoftwareInfo < ActiveRecord::Migration
+  def up
+    benefited_people = 0
+    saved_resources = 0
+
+    select_all("SELECT * FROM tasks WHERE status=3 AND type='CreateOrganizationRatingComment'").each do |task|
+      settings = YAML.load(task['data'])
+      organization_rating = select_one("SELECT * FROM organization_ratings WHERE id=#{settings[:organization_rating_id]}")
+
+      benefited_people += organization_rating["people_benefited"].to_i
+      saved_resources += organization_rating["saved_value"].to_f
+      execute("UPDATE software_infos SET benefited_people=#{benefited_people}, saved_resources=#{saved_resources} WHERE software_infos.community_id=#{organization_rating["organization_id"]}")
+    end
+  end
+
+  def down
+    execute("UPDATE software_infos SET benefited_people=0, saved_resources=0")
+  end
+end
@@ -25,6 +25,7 @@ Feature: edit adherent fields
  
   Scenario: Change software block to generic software block
     Given I am logged in as mpog_admin
+    And I go to /myprofile/mpog_admin
     And I follow "Control panel"
     And I follow "Edit sideboxes"
     When I follow "Add a block"
@@ -45,4 +46,4 @@ Feature: edit adherent fields
     And I follow "Edit" within ".softwares-block"
     And I select "Public" from "block_software_type"
     And I press "Save"
-    Then I should see "public software"
 \ No newline at end of file
+    Then I should see "public software"
@@ -64,6 +64,53 @@ Given /^I type in &quot;([^&quot;]*)&quot; in autocomplete list &quot;([^&quot;]*)&quot; and I choose &quot;([^&quot;]*)
   sleep 1
 end
  
+Given /^Institutions has initial default values on database$/ do
+  GovernmentalPower.create(:name => "Executivo")
+  GovernmentalPower.create(:name => "Legislativo")
+  GovernmentalPower.create(:name => "Judiciario")
+
+  GovernmentalSphere.create(:name => "Federal")
+
+  JuridicalNature.create(:name => "Autarquia")
+  JuridicalNature.create(:name => "Administracao Direta")
+  JuridicalNature.create(:name => "Empresa Publica")
+  JuridicalNature.create(:name => "Fundacao")
+  JuridicalNature.create(:name => "Orgao Autonomo")
+  JuridicalNature.create(:name => "Sociedade")
+  JuridicalNature.create(:name => "Sociedade Civil")
+  JuridicalNature.create(:name => "Sociedade de Economia Mista")
+
+  national_region = NationalRegion.new
+  national_region.name = "Distrito Federal"
+  national_region.national_region_code = '35'
+  national_region.national_region_type_id = NationalRegionType::STATE
+  national_region.save
+end
+
+Given /^the following organization ratings$/ do |table|
+  table.hashes.each do |item|
+    person = User.where(login: item[:user_login]).first.person
+    organization = Organization.where(name: item[:organization_name]).first
+
+    rating = OrganizationRating.new
+    rating.value = item[:value]
+    rating.organization_id = organization.id
+    rating.person_id = person.id
+    rating.saved_value = item[:saved_value]
+    rating.institution_id = Institution.where(name: item[:institution_name]).first.id
+    rating.save
+
+    comment_task = CreateOrganizationRatingComment.create!(
+      :body => "empty comment",
+      :requestor => person,
+      :organization_rating_id => rating.id,
+      :target => organization)
+
+    comment_task.status = item[:task_status]
+    comment_task.save
+  end
+end
+
 Given /^the following public institutions?$/ do |table|
   # table is a Cucumber::Ast::Table
   table.hashes.each do |item|
@@ -247,3 +294,7 @@ end
 Then /^there should be (\d+) divs? with class "([^"]*)"$/ do |count, klass|
   should have_selector("div.#{klass}", :count => count)
 end
+
+Given /^I should see "([^"]*)" in the page/ do |message|
+  assert_match message, page.body
+end
@@ -0,0 +1,8 @@
+require_dependency "application_helper"
+
+ApplicationHelper.class_eval do
+
+  def number_to_human(value)
+    number_with_delimiter(value, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter)
+  end
+end
@@ -18,7 +18,7 @@ class Community
     community = Community.new(attributes)
  
     if community.environment.enabled?('admin_must_approve_new_communities') &&
-      !community.environment.admins.include?(requestor)
+      !community.is_admin?(requestor)
  
       cc = CreateCommunity.create(attributes.merge(:requestor => requestor))
     else
@@ -0,0 +1,17 @@
+require_dependency "create_organization_rating_comment"
+
+CreateOrganizationRatingComment.class_eval do
+  after_save :update_software_statistic
+
+  def update_software_statistic
+    if(self.status == Task::Status::FINISHED)
+      rating = OrganizationRating.find_by_id(self.organization_rating_id)
+      software = SoftwareInfo.find_by_community_id(self.target_id)
+      if software.present? and rating.present?
+        software.saved_resources += rating.saved_value if rating.saved_value
+        software.benefited_people += rating.people_benefited if rating.people_benefited
+        software.save
+      end
+    end
+  end
+end
@@ -100,14 +100,38 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
     Proc::new do "<h1 class='title'>#{title}</h1>" end
   end
  
-  def organization_ratings_plugin_extra_fields_show_data user_rating
+  def organization_ratings_plugin_container_extra_fields user_rating
     Proc::new {
       if logged_in?
-        is_admin = environment.admins.include?(current_user.person)
-        is_admin ||= user_rating.organization.admins.include?(current_user.person)
+        is_admin = user.is_admin? || user_rating.organization.is_admin?(user)
  
         if is_admin and profile.software?
-            render :file => 'organization_ratings_extra_fields_show_data',
+
+            render :file => 'organization_ratings_container_extra_fields_show_statistics',
+                   :locals => {:user_rating => user_rating}
+        end
+      end
+    }
+  end
+
+  def organization_ratings_plugin_rating_created rating, params
+    if params[:organization_rating].present? && (params[:organization_rating][:people_benefited].present? ||
+                                                  params[:organization_rating][:saved_value].present?)
+      CreateOrganizationRatingComment.create!(
+        :requestor => rating.person,
+        :organization_rating_id => rating.id,
+        :target => rating.organization) unless params[:comments] && params[:comments][:body].present?
+    end
+  end
+
+  def organization_ratings_plugin_task_extra_fields user_rating
+    Proc::new {
+      if logged_in?
+        is_admin = user.is_admin? || user_rating.organization.is_admin?(user)
+
+        if is_admin and profile.software?
+
+            render :file => 'organization_ratings_task_extra_fields_show_statistics',
                    :locals => {:user_rating => user_rating}
         end
       end
@@ -166,7 +166,7 @@ class SoftwareInfo &lt; ActiveRecord::Base
     another_license_link = attributes.delete(:another_license_link)
  
     software_info = SoftwareInfo.new(attributes)
-    unless environment.admins.include? requestor
+    if !requestor.is_admin?
       CreateSoftware.create!(
         attributes.merge(
           :requestor => requestor,
@@ -20,13 +20,15 @@ class StatisticBlock &lt; Block
     end
  
     block = self
+    statistics = get_software_statistics
  
     lambda do |object|
       render(
         :file => 'blocks/software_statistics',
         :locals => {
           :block => block,
-          :total_downloads => downloads.sum
+          :total_downloads => downloads.sum,
+          :statistics => statistics
         }
       )
     end
@@ -49,4 +51,12 @@ class StatisticBlock &lt; Block
     downloads.select! {|value| not value.nil? }
     downloads.sum
   end
+
+  def get_software_statistics
+    statistics = {}
+    software = SoftwareInfo.find_by_community_id(self.owner.id)
+    statistics[:saved_resources] = software.saved_resources
+    statistics[:benefited_people] = software.benefited_people
+    statistics
+  end
 end
@@ -0,0 +1,85 @@
+require 'test_helper'
+require 'organization_ratings_plugin_profile_controller'
+require File.dirname(__FILE__) + '/../helpers/software_test_helper'
+
+# Re-raise errors caught by the controller.
+class OrganizationRatingsPluginProfileController; def rescue_action(e) raise e end; end
+
+class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCase
+  include SoftwareTestHelper
+
+  def setup
+    @controller = OrganizationRatingsPluginProfileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @environment = Environment.default
+    @environment.enabled_plugins = ['OrganizationRatingsPlugin']
+    @environment.enabled_plugins = ['SoftwareCommunitiesPlugin']
+    @environment.save
+
+    LicenseInfo.create(:version=>"CC-GPL-V2",
+                      :link=>"http://creativecommons.org/licenses/GPL/2.0/legalcode.pt")
+
+    @person = create_user('testuser').person
+    @software = create_software(software_fields)
+    @statistic_block = StatisticBlock.new
+    @software.community.blocks << @statistic_block
+    @software.community.save!
+
+    login_as(@person.identifier)
+    @controller.stubs(:logged_in?).returns(true)
+    @controller.stubs(:current_user).returns(@person.user)
+  end
+
+  test "should create a task with a valid benefited people value and no comment" do
+    assert_difference 'CreateOrganizationRatingComment.count' do
+      post :new_rating, profile: @software.community.identifier, :comments => {:body => ""},
+                        :organization_rating_value => 3, :organization_rating => {:people_benefited => 50}
+    end
+  end
+
+  test "should create a task with a valid saved value and no comment" do
+    assert_difference 'CreateOrganizationRatingComment.count' do
+      post :new_rating, profile: @software.community.identifier, :comments => {:body => ""},
+                        :organization_rating_value => 3, :organization_rating => {:saved_value => 50000000}
+    end
+  end
+
+  test "should not create a task with no saved value or benefited poeple, and no comment" do
+    assert_no_difference 'CreateOrganizationRatingComment.count' do
+      post :new_rating, profile: @software.community.identifier, :comments => {:body => ""},
+                        :organization_rating_value => 3, :organization_rating => nil
+    end
+  end
+
+  test "software statistics should be updated when task is accepted" do
+    @software.reload
+    assert_equal 0, @software.benefited_people
+    assert_equal 0.0, @software.saved_resources
+
+    post :new_rating, profile: @software.community.identifier, :comments => {:body => ""},
+                      :organization_rating_value => 3,
+                      :organization_rating => {:saved_value => 500, :people_benefited => 10}
+
+    CreateOrganizationRatingComment.last.finish
+    @software.reload
+    assert_equal 10, @software.benefited_people
+    assert_equal 500.0, @software.saved_resources
+  end
+
+  test "software statistics should not be updated when task is cancelled" do
+    @software.reload
+    assert_equal 0, @software.benefited_people
+    assert_equal 0.0, @software.saved_resources
+
+    post :new_rating, profile: @software.community.identifier, :comments => {:body => ""},
+                      :organization_rating_value => 3,
+                      :organization_rating => {:saved_value => 500, :people_benefited => 10}
+
+    CreateOrganizationRatingComment.last.cancel
+    @software.reload
+    assert_equal 0, @software.benefited_people
+    assert_equal 0.0, @software.saved_resources
+  end
+end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/software_test_helper'
+require 'test_helper'
 require(
   File.dirname(__FILE__) +
   '/../../../../app/controllers/my_profile/profile_editor_controller'
@@ -7,13 +8,18 @@ require(
 class ProfileEditorController; def rescue_action(e) raise e end; end
  
 class ProfileEditorControllerTest < ActionController::TestCase
-
+  include SoftwareTestHelper
   def setup
     @controller = ProfileEditorController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     @profile = create_user('default_user').person
  
+    LicenseInfo.create(
+      :version=>"CC-GPL-V2",
+      :link=>"http://creativecommons.org/licenses/GPL/2.0/legalcode.pt"
+    )
+
     Environment.default.affiliate(
       @profile,
       [Environment::Roles.admin(Environment.default.id)] +
@@ -29,42 +35,14 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     @environment.save
   end
  
-  should "redirect to edit_software_community on edit community of software" do
-    software = create_software_info("Test Software")
+  def teardown
+    Community.destroy_all
+    SoftwareInfo.destroy_all
+  end
  
+  should "redirect to edit_software_community on edit community of software" do
+    software = create_software(software_fields)
     post :edit, :profile => software.community.identifier
-
     assert_redirected_to :controller => 'profile_editor', :action => 'edit_software_community'
   end
-
-
-  protected
-
-  def create_basic_user
-    user = fast_create(User)
-    user.person = fast_create(Person)
-    user.person.user = user
-    user.save!
-    user.person.save!
-    user
-  end
-
-  def create_community name
-    community = fast_create(Community)
-    community.name = name
-    community.save
-    community
-  end
-
-  def create_software_info name, finality = "something", acronym = ""
-    community = create_community(name)
-    software_info = SoftwareInfo.new
-    software_info.community = community
-    software_info.finality = finality
-    software_info.acronym = acronym
-    software_info.public_software = true
-    software_info.save
-    software_info
-  end
-
 end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
 require(
   File.dirname(__FILE__) +
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../../controllers/software_communities_plugin_controller'
  
 class SoftwareCommunitiesPluginController; def rescue_action(e) raise e end; end
 require 'test_helper'
-require_relative '../helpers/software_test_helper'
-require_relative(
-  '../../controllers/software_communities_plugin_myprofile_controller'
+require File.dirname(__FILE__) + '/../helpers/software_test_helper'
+require(
+  File.dirname(__FILE__) +
+  '/../../controllers/software_communities_plugin_myprofile_controller'
 )
  
 class SoftwareCommunitiesPluginMyprofileController; def rescue_action(e) raise e end;
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/software_test_helper'
 require File.dirname(__FILE__) + '/../../controllers/software_communities_plugin_profile_controller'
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class CategoriesAndTagsBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class CategoriesSoftwareBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class CommunitiesBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class DatabaseHelperTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class DatabaseValidationTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class DownloadBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class DownloadTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class LibraryHelperTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class LibraryValidationTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 OperatingSystemName.create(:name=>"Debina")
 OperatingSystemName.create(:name=>"Fedora")
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class OperatingSystemValidationTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class RepositoryBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class SearchCatalogBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../../lib/ext/search_helper.rb'
  
 class SearchHelperTest < ActiveSupport::TestCase
 # encoding: utf-8
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class GovUserPluginPersonTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class SoftwareDatabaseTest < ActiveSupport::TestCase
   def setup
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class SoftwareEventsBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class SoftwareHelperTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class SoftwareInfoValidationTest < ActiveSupport::TestCase
@@ -41,4 +41,4 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase
     assert_equal @software_info.license_info.link, another_license_link
   end
  
-end
 \ No newline at end of file
+end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class SoftwareInfoValidationTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class SoftwareLanguageHelperTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class SoftwareLanguageValidationTest < ActiveSupport::TestCase
   def setup
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class SoftwareDatabaseTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
  
 class SoftwareRegistrationTest < ActiveSupport::TestCase
  
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class SoftwareTabDataBlockTest < ActiveSupport::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  
 class SoftwaresBlockTest < ActiveSupport::TestCase
 <div class="software-metrics-block">
   <ul class="metrics-list">
     <li>
-    	<span class="arrow-globe-icon"></span>
-    	<span id="visit-count">
-    		<%= pluralize(profile.hits, 'visita', 'visitas') %>
-    	</span>
+      <span class="arrow-globe-icon"></span>
+      <span id="visit-count">
+        <%= pluralize(profile.hits, 'visita', 'visitas') %>
+      </span>
     </li>
     <li>
-    	<span class="downloads-icon"></span>
-    	<span id="downloads-count">
-    		<%= pluralize(total_downloads, 'download', 'downloads') %>
-    	</span>
+      <span class="downloads-icon"></span>
+      <span id="downloads-count">
+        <%= pluralize(total_downloads, 'download', 'downloads') %>
+      </span>
     </li>
     <li>
-    	<span class="face-icon"></span>
-    	<span id="benefited-people">
-    		<%= block.benefited_people.to_s + _(' benefited people*') %>
-    	</span>
+      <span class="face-icon"></span>
+      <span id="benefited-people">
+        <%= number_to_human(statistics[:benefited_people]) + _(' benefited people*') %>
+      </span>
     </li>
     <li>
-    	<span class="pig-safe-icon"></span>
-    	<span id="saved-resources">
-    		<strong class="saved-money">
-    			<%= number_to_currency(block.saved_resources, unit: 'R$ ',
-    			 separator: ',', delimiter: '.') %>
-    		</strong>
-    		<%= _(' saved resources*') %>
-    	</span>
+      <span class="pig-safe-icon"></span>
+      <span id="saved-resources">
+        <strong class="saved-money">
+          <%= float_to_currency(statistics[:saved_resources]) %>
+        </strong>
+        <%= _(' saved resources*') %>
+      </span>
     </li>
   </ul>
  
   <div class="admin-estimation">
-  	* <%= _("Data estimated by the software administrator.") %>
+    * <%= _("Data estimated by the software administrator.") %>
   </div>
 </div>
 <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 %>
+  <% benefited_people = @block.owner.software_info.benefited_people + 5 %>
+  <% saved_resources = @block.owner.software_info.saved_resources  + 5 %>
  
-  <%= 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>
+  <p> <%= _("Statistics to be displayed ") %>
  
+  <p> <%= _("People Benefited: ") %> <span> <%= number_to_human(benefited_people) %> </span> </p>
+  <p> <%= _("Saved Resources: ") %> <span> <%= float_to_currency(saved_resources) %> </span> </p>
+</div>
@@ -0,0 +1,10 @@
+<div class="aditional-informations">
+  <div class="comments-people-benefited">
+    <span><%=_("Benefited People")%>:</span> <%= number_with_delimiter(user_rating.people_benefited, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter) unless user_rating.nil? %>
+  </div>
+
+  <div class="comments-saved-value">
+    <span><%=_("Saved Resources")%>:</span> <%= float_to_currency(user_rating.saved_value) unless user_rating.nil? %>
+  </div>
+</div>
+
@@ -0,0 +1,10 @@
+<div class="aditional-informations">
+  <div class="comments-people-benefited">
+    <span><%=_("Benefited People")%> :</span> <%= user_rating.people_benefited unless user_rating.nil? %>
+  </div>
+
+  <div class="comments-saved-value">
+    <span><%=_("Saved Resources")%> :</span> <%= user_rating.saved_value unless user_rating.nil? %>
+  </div>
+</div>
+
@@ -13,7 +13,7 @@
  
 <%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do |f| %>
  
-  <% if environment.admins.include?(user) %>
+  <% if user.is_admin? %>
     <div id="profile-is-template">
       <%= labelled_check_box(_('This profile is a template'), 'profile_data[is_template]', true, @profile.is_template) %>
     </div>
@@ -78,7 +78,7 @@
   <% if user && user.has_permission?('destroy_profile', profile) && !@first_edit %>
     <% button_bar(:id => 'delete-profile') do %>
       <%= button(:remove, _('Delete software and community'), {:action => :destroy_profile}) %>
-      <% if environment.admins.include?(current_person) %>
+      <% if user.is_admin? %>
         <% if profile.visible? %>
           <%= button(:remove, _('Deactivate software and community'), {:action => :deactivate_profile, :id=>profile.id}, :id=>'deactivate_profile_button', :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
         <% else %>
+class MoveSoftwareStatisticsFromBlockToSoftwareInfo < ActiveRecord::Migration
+  def up
+    select_all("SELECT * FROM software_infos").each do |software|
+class MoveSoftwareStatisticsFromBlockToSoftwareInfo < ActiveRecord::Migration
+  def up
+    select_all("SELECT * FROM software_infos").each do |software|
+      benefited_people = 0
+      saved_resources = 0
+
+      select_all("SELECT * FROM tasks WHERE status=3 AND type='CreateOrganizationRatingComment'").each do |task|
+class MoveSoftwareStatisticsFromBlockToSoftwareInfo < ActiveRecord::Migration
+  def up
+    select_all("SELECT * FROM software_infos").each do |software|
+      benefited_people = 0
+      saved_resources = 0
+
+      select_all("SELECT * FROM tasks WHERE status=3 AND type='CreateOrganizationRatingComment'").each do |task|
+        settings = YAML.load(task['data'])
+        organization_rating = select_all("SELECT * FROM organization_ratings WHERE id=#{settings[:organization_rating_id]}").first
+<% if user_rating.institution %>
+<div class="aditional-informations">
+  <div class="comments-user-institution">
+    <span><%=_("Institution")%> :<span> <%= user_rating.institution.name %>
   <% if user && user.has_permission?('destroy_profile', profile) && !@first_edit %>
     <% button_bar(:id => 'delete-profile') do %>
       <%= button(:remove, _('Delete software and community'), {:action => :destroy_profile}) %>
-      <% if environment.admins.include?(current_person) %>
-        <% if profile.visible? %>
+      <% if user.is_admin? %>
+        <% iprofile.visible? %>
...	...	@@ -111,7 +111,7 @@ class GovUserPluginController < ApplicationController
111	111	params[:community] \|\|= {}
112	112	params[:institutions] \|\|= {}
113	113
114		- @show_sisp_field = environment.admins.include?(current_user.person)
	114	+ @show_sisp_field = user.is_admin?
115	115	@governmental_sphere = get_governmental_spheres()
116	116	@governmental_power = get_governmental_powers()
117	117	@juridical_nature = get_juridical_natures()
...	...	@@ -209,7 +209,7 @@ class GovUserPluginController < ApplicationController
209	209
210	210	def add_environment_admins_to_institution institution
211	211	edit_page = params[:edit_institution_page] == false
212		- if environment.admins.include?(current_user.person) && edit_page
	212	+ if user.is_admin? && edit_page
213	213	environment.admins.each do \|adm\|
214	214	institution.community.add_admin(adm)
215	215	end
...	...
...	...	@@ -5,7 +5,7 @@ class GovUserPluginMyprofileController < MyProfileController
5	5	end
6	6
7	7	def edit_institution
8		- @show_sisp_field = environment.admins.include?(current_user.person)
	8	+ @show_sisp_field = user.is_admin?
9	9	@state_list = NationalRegion.find(
10	10	:all,
11	11	:conditions => { :national_region_type_id => 2 },
...	...
...	...	@@ -0,0 +1,61 @@
	1	+Feature: rate_community
	2	+ As an admin
	3	+ I want to see a warning in the task if a software already has a rating related to an specific institution
	4	+ So it will be clear when the saved value will be updated
	5	+
	6	+ Background:
	7	+ Given the environment domain is "localhost"
	8	+ And "OrganizationRatings" plugin is enabled
	9	+ And "SoftwareCommunities" plugin is enabled
	10	+ And "GovUser" plugin is enabled
	11	+ And I am logged in as mpog_admin
	12	+ And I go to /admin/plugins
	13	+ And I check "Organization Ratings"
	14	+ And I check "GovUserPlugin"
	15	+ And I check "SoftwareCommunitiesPlugin"
	16	+ And I press "Save changes"
	17	+ And the following user
	18	+ \| login \| name \|
	19	+ \| joaosilva \| Joao Silva \|
	20	+ And the following softwares
	21	+ \| name \| public_software \| finality \|
	22	+ \| mycommunity \| true \| basic software finality \|
	23	+ \| anothercommunity \| true \| basic software finality \|
	24	+ And the following blocks
	25	+ \| owner \| type \|
	26	+ \| mycommunity \| OrganizationRatingsBlock \|
	27	+ And Institutions has initial default values on database
	28	+ And the following public institutions
	29	+ \| name \| acronym \| country \| state \| city \| cnpj \| juridical_nature \| governmental_power \| governmental_sphere \| corporate_name \|
	30	+ \| Ministerio das Cidades \| MC \| BR \| DF \| Gama \| 58.745.189/0001-21 \| Autarquia \| Executivo \| Federal \| Ministerio das Cidades \|
	31	+ \| Ministerio do Planejamento \| MP \| BR \| DF \| Brasilia \| 41.769.591/0001-43 \| Autarquia \| Judiciario \| Federal \| Ministerio do Planejamento \|
	32	+
	33	+ Scenario: display message on task when a rating with the same institution exists on the same software
	34	+ Given the following organization ratings
	35	+ \| value \| organization_name \| user_login \| institution_name \| task_status \|
	36	+ \| 5 \| mycommunity \| joaosilva \| Ministerio das Cidades \| 3 \|
	37	+ \| 4 \| mycommunity \| joaosilva \| Ministerio das Cidades \| 1 \|
	38	+ And I go to mycommunity's control panel
	39	+ And I follow "Process requests" within ".pending-tasks"
	40	+ And I choose "Accept" within ".task_decisions"
	41	+ Then I should see "This instiution already has an accepted rating" in the page
	42	+
	43	+ Scenario: do not display message on task when a rating with the same institution does not exist on the same software
	44	+ Given the following organization ratings
	45	+ \| value \| organization_name \| user_login \| institution_name \| task_status \|
	46	+ \| 5 \| mycommunity \| joaosilva \| Ministerio das Cidades \| 3 \|
	47	+ \| 4 \| mycommunity \| joaosilva \| Ministerio do Planejamento \| 1 \|
	48	+ And I go to mycommunity's control panel
	49	+ And I follow "Process requests" within ".pending-tasks"
	50	+ And I choose "Accept" within ".task_decisions"
	51	+ Then I should not see "This instiution already has an accepted rating" within ".task_box"
	52	+
	53	+ Scenario: do not display message on task when a rating with the same institution exist on different softwares
	54	+ Given the following organization ratings
	55	+ \| value \| organization_name \| user_login \| institution_name \| task_status \|
	56	+ \| 5 \| mycommunity \| joaosilva \| Ministerio das Cidades \| 3 \|
	57	+ \| 4 \| anothercommunity \| joaosilva \| Ministerio das Cidades \| 1 \|
	58	+ And I go to anothercommunity's control panel
	59	+ And I follow "Process requests" within ".pending-tasks"
	60	+ And I choose "Accept" within ".task_decisions"
	61	+ Then I should not see "This instiution already has an accepted rating" within ".task_box"
...	...
...	...	@@ -54,9 +54,7 @@ class GovUserPlugin < Noosfero::Plugin
54	54	def profile_editor_controller_filters
55	55	block = proc do
56	56	if request.post? && params[:institution]
57		- is_admin = environment.admins.include?(current_user.person)
58		-
59		- unless is_admin
	57	+ unless user.is_admin?
60	58	institution = profile.user.institutions
61	59
62	60	if !params[:institution].blank? && params[:institution].class == Hash && !params[:institution][:sisp].nil?
...	...	@@ -241,16 +239,30 @@ class GovUserPlugin < Noosfero::Plugin
241	239	Proc::new do render :file => 'ratings_extra_field' end
242	240	end
243	241
244		- def organization_ratings_plugin_extra_fields_show_data user_rating
	242	+ def organization_ratings_plugin_task_extra_fields user_rating
	243	+ gov_user_self = self
	244	+
	245	+ Proc::new {
	246	+ if logged_in?
	247	+ is_admin = user.is_admin? \|\| user_rating.organization.is_admin?(user)
	248	+
	249	+ if is_admin and gov_user_self.context.profile.software?
	250	+ render :file => 'organization_ratings_task_extra_fields_show_institution',
	251	+ :locals => {:user_rating => user_rating}
	252	+ end
	253	+ end
	254	+ }
	255	+ end
	256	+
	257	+ def organization_ratings_plugin_container_extra_fields user_rating
245	258	gov_user_self = self
246	259
247	260	Proc::new {
248	261	if logged_in?
249		- is_admin = environment.admins.include?(current_user.person)
250		- is_admin \|\|= user_rating.organization.admins.include?(current_user.person)
	262	+ is_admin = user.is_admin? \|\| user_rating.organization.is_admin?(user)
251	263
252	264	if is_admin and gov_user_self.context.profile.software?
253		- render :file => 'organization_ratings_extra_fields_show_institution',
	265	+ render :file => 'organization_ratings_container_extra_fields_show_institution',
254	266	:locals => {:user_rating => user_rating}
255	267	end
256	268	end
...	...
...	...	@@ -36,6 +36,14 @@ class Institution < ActiveRecord::Base
36	36	:verify_institution_type, :validate_format_cnpj
37	37
38	38
	39	+ def has_accepted_rating? user_rating
	40	+ rating_ids = OrganizationRating.where(institution_id: self.id, organization_id: user_rating.organization_id).map(&:id)
	41	+ finished_tasks = CreateOrganizationRatingComment.finished.select {\|task\| rating_ids.include?(task.organization_rating_id)}
	42	+ pending_tasks = CreateOrganizationRatingComment.pending.select{\|c\| c.organization_rating_id == user_rating.id}
	43	+
	44	+ !finished_tasks.empty? && !pending_tasks.empty?
	45	+ end
	46	+
39	47	protected
40	48
41	49	def verify_institution_type
...	...
...	...	@@ -230,7 +230,7 @@ class GovUserPluginControllerTest < ActionController::TestCase
230	230	fields[:edit_institution_page] = false
231	231	post :new_institution, fields
232	232
233		- assert(Institution.last.community.admins.include?(admin2) )
	233	+ assert(Institution.last.community.is_admin?(admin2) )
234	234	end
235	235
236	236	end
...	...
1		-require File.dirname(__FILE__) + '/../../../../test/test_helper'
	1	+require 'test_helper'
2	2	require File.dirname(__FILE__) + '/../helpers/institution_test_helper'
3	3	require(
4	4	File.dirname(__FILE__) +
...	...
...	...	@@ -0,0 +1,7 @@
	1	+<% if user_rating.institution %>
	2	+<div class="aditional-informations">
	3	+ <div class="comments-user-institution">
	4	+ <span><%=_("Institution")%> :</span> <%= user_rating.institution.name %>
	5	+ </div>
	6	+</div>
	7	+<% end %>
...	...
...	...	@@ -0,0 +1,13 @@
	1	+<% if user_rating.institution %>
	2	+<div class="aditional-informations">
	3	+ <div class="comments-user-institution">
	4	+ <span><%=_("Institution")%> :</span> <%= user_rating.institution.name %>
	5	+ </div>
	6	+
	7	+ <% if user_rating.institution.has_accepted_rating?(user_rating) %>
	8	+ <div class="">
	9	+ <span><%=_("This instiution already has an accepted rating. Accepting it will automatically update the saved value.") %></span>
	10	+ </div>
	11	+ <% end %>
	12	+</div>
	13	+<% end %>
...	...
...	...	@@ -630,3 +630,107 @@
630	630	}
631	631
632	632	/* end fo software internal pages */
	633	+
	634	+/* organization-rating review page (tasks of software) */
	635	+
	636	+.task-list .task_boxes{
	637	+ font-family: Arial;
	638	+}
	639	+
	640	+.task-list .task_boxes .task_box .task_date{
	641	+ position: absolute;
	642	+ left: 80px;
	643	+}
	644	+
	645	+.task_boxes .task_box .task_title{
	646	+ position: absolute;
	647	+ left: 80px;
	648	+ font-weight: 500;
	649	+ margin-top: 10px;
	650	+}
	651	+
	652	+.task_boxes .task_box .task_responsible{
	653	+ text-align: right;
	654	+}
	655	+
	656	+.task_boxes .task_box .task_responsible span select{
	657	+ padding: 4px 15px 1px 4px;
	658	+}
	659	+
	660	+.task_boxes .task_box .task_decisions{
	661	+ float: right;
	662	+ padding-right: 5px;
	663	+}
	664	+
	665	+.task_boxes .task_box .task_information{
	666	+ margin-top: 40px;
	667	+ font-size: 13px;
	668	+}
	669	+
	670	+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited{
	671	+ float: left;
	672	+ font-weight: 900;
	673	+}
	674	+
	675	+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value{
	676	+ font-weight: 900;
	677	+ margin-left: 160px;
	678	+}
	679	+
	680	+.task_boxes .task_box .organization-rating-comment-body .aditional-informations{
	681	+ margin-top: 10px;
	682	+ margin-bottom: 10px;
	683	+ border-bottom: 1px solid #CDCDCD;
	684	+ padding-bottom: 15px;
	685	+}
	686	+
	687	+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-user-institution span span{
	688	+ font-weight: 900;
	689	+}
	690	+
	691	+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-people-benefited span{
	692	+ font-weight: 100;
	693	+}
	694	+
	695	+.task_boxes .task_box .organization-rating-comment-body .aditional-informations .comments-saved-value span{
	696	+ font-weight: 100;
	697	+}
	698	+
	699	+.task_boxes .task_box .organization-rating-comment-body .task-comment span{
	700	+ font-weight: 600;
	701	+ color: rgb(140, 140, 140);
	702	+ font-size: 11px;
	703	+}
	704	+
	705	+.task_boxes .task_box .organization-rating-comment-body .task-comment{
	706	+ margin-bottom: 15px;
	707	+}
	708	+
	709	+.task_boxes .task_box .organization-rating-comment-body .task-comment span p{
	710	+ font-weight: 100;
	711	+ font-size: 12px;
	712	+ color: black;
	713	+ line-height: 16px;
	714	+}
	715	+
	716	+.task_boxes .task_box .organization-rating-comment-body .task-comment{
	717	+ line-height: 25px;
	718	+}
	719	+
	720	+.task_boxes .task_box .organization-rating-comment-body .rating-notice{
	721	+ display: block;
	722	+ color: #F11467;
	723	+ padding: 5px 5px;
	724	+ background: #ccc;
	725	+}
	726	+
	727	+.task_boxes .task_box .organization-rating-comment-body .task-star-container{
	728	+ margin-bottom: 30px;
	729	+ margin-top: 10px;
	730	+}
	731	+
	732	+.action-tasks-index .task_box{
	733	+ padding: 10px;
	734	+}
	735	+
	736	+/* end of organization-rating review page (tasks of software) */
...	...