Software Communities plugin rating improvements

- Move software statistics from blocks table to softwares table - Update methods called on view to display software statistics - Software now automagically sums saved_resources and benefited people when the task is accepted - Adds one hotspot to insert content on ratings task and another one to ratings container (used on ratings page and ratings block) - Removes statistic block fields that are no longer used - Adds number_to_human method to get better visualization for numbers - Makes the software tasks page closer to the prototype (changes in the divs, sizes and aligns). - Fixed broken tests on software_profile_editor_controller Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com> (cherry picked from commit 53ef4b9015a78e895d869c755b2ab202fa266e4a)

Software Communities plugin rating improvements
- Move software statistics from blocks table to softwares table - Update methods called on view to display software statistics - Software now automagically sums saved_resources and benefited people when the task is accepted - Adds one hotspot to insert content on ratings task and another one to ratings container (used on ratings page and ratings block) - Removes statistic block fields that are no longer used - Adds number_to_human method to get better visualization for numbers - Makes the software tasks page closer to the prototype (changes in the divs, sizes and aligns). - Fixed broken tests on software_profile_editor_controller Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com> (cherry picked from commit 53ef4b9015a78e895d869c755b2ab202fa266e4a)
Gabriel Silva · Thiago Ribeiro
1 parent 1c4e929b
Showing 50 changed files with 434 additions and 118 deletions Show diff stats
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
src/noosfero-spb/software_communities/lib/software_info.rb
src/noosfero-spb/software_communities/lib/statistic_block.rb
src/noosfero-spb/software_communities/test/functional/organization_ratings_plugin_profile_controller_test.rb
src/noosfero-spb/software_communities/test/functional/profile_editor_controller_test.rb
src/noosfero-spb/software_communities/test/functional/search_controller_test.rb
src/noosfero-spb/software_communities/test/functional/software_communities_plugin_controller_test.rb
src/noosfero-spb/software_communities/test/functional/software_communities_plugin_myprofile_controller_test.rb
src/noosfero-spb/software_communities/test/functional/software_communities_plugin_profile_controller_test.rb
src/noosfero-spb/software_communities/test/unit/categories_and_tags_block_test.rb
src/noosfero-spb/software_communities/test/unit/categories_software_block_test.rb
@@ -631,3 +631,106 @@
 }
 /*** 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;
+}
+
+.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>
+
@@ -1,10 +0,0 @@
-<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 %>
	@@ -631,3 +631,106 @@		@@ -631,3 +631,106 @@
631	}	631	}
632		632
633	/* end fo software internal pages */	633	/* end fo software internal pages */
		634	+
		635	+/* organization-rating review page (tasks of software) */
		636	+
		637	+.task-list .task_boxes{
		638	+ font-family: Arial;
		639	+}
		640	+
		641	+.task-list .task_boxes .task_box .task_date{
		642	+ position: absolute;
		643	+ left: 80px;
		644	+}
		645	+
		646	+.task_boxes .task_box .task_title{
		647	+ position: absolute;
		648	+ left: 80px;
		649	+ font-weight: 500;
		650	+ margin-top: 10px;
		651	+}
		652	+
		653	+.task_boxes .task_box .task_responsible{
		654	+ text-align: right;
		655	+}
		656	+
		657	+.task_boxes .task_box .task_responsible span select{
		658	+ padding: 4px 15px 1px 4px;
		659	+}
		660	+
		661	+.task_boxes .task_box .task_decisions{
		662	+ float: right;
		663	+ padding-right: 5px;
		664	+}
		665	+
		666	+.task_boxes .task_box .task_information{
		667	+ margin-top: 40px;
		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) */
	@@ -144,7 +144,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController		@@ -144,7 +144,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController
144		144
145	add_admin_to_community	145	add_admin_to_community
146		146
147	- if !environment.admins.include?(current_user.person)	147	+ if !user.is_admin?
148	session[:notice] = _('Your new software request will be evaluated by an'\	148	session[:notice] = _('Your new software request will be evaluated by an'\
149	'administrator. You will be notified.')	149	'administrator. You will be notified.')
150	redirect_to user.admin_url	150	redirect_to user.admin_url
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddStatisticsToSoftwareInfo < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :software_infos, :benefited_people, :integer, :default => 0
	4	+ add_column :software_infos, :saved_resources, :decimal, :default => 0
	5	+ end
	6	+
	7	+ def down
	8	+ remove_column :software_infos, :benefited_people
	9	+ remove_column :software_infos, :saved_resources
	10	+ end
	11	+end
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+class MoveSoftwareStatisticsFromBlockToSoftwareInfo < ActiveRecord::Migration
	2	+ def up
	3	+ benefited_people = 0
	4	+ saved_resources = 0
	5	+
	6	+ select_all("SELECT * FROM tasks WHERE status=3 AND type='CreateOrganizationRatingComment'").each do \|task\|
	7	+ settings = YAML.load(task['data'])
	8	+ organization_rating = select_one("SELECT * FROM organization_ratings WHERE id=#{settings[:organization_rating_id]}")
	9	+
	10	+ benefited_people += organization_rating["people_benefited"].to_i
	11	+ saved_resources += organization_rating["saved_value"].to_f
	12	+ execute("UPDATE software_infos SET benefited_people=#{benefited_people}, saved_resources=#{saved_resources} WHERE software_infos.community_id=#{organization_rating["organization_id"]}")
	13	+ end
	14	+ end
	15	+
	16	+ def down
	17	+ execute("UPDATE software_infos SET benefited_people=0, saved_resources=0")
	18	+ end
	19	+end
	@@ -64,6 +64,53 @@ Given /^I type in "([^"])" in autocomplete list "([^"])" and I choose "([^"]*)		@@ -64,6 +64,53 @@ Given /^I type in "([^"])" in autocomplete list "([^"])" and I choose "([^"]*)
64	sleep 1	64	sleep 1
65	end	65	end
66		66
		67	+Given /^Institutions has initial default values on database$/ do
		68	+ GovernmentalPower.create(:name => "Executivo")
		69	+ GovernmentalPower.create(:name => "Legislativo")
		70	+ GovernmentalPower.create(:name => "Judiciario")
		71	+
		72	+ GovernmentalSphere.create(:name => "Federal")
		73	+
		74	+ JuridicalNature.create(:name => "Autarquia")
		75	+ JuridicalNature.create(:name => "Administracao Direta")
		76	+ JuridicalNature.create(:name => "Empresa Publica")
		77	+ JuridicalNature.create(:name => "Fundacao")
		78	+ JuridicalNature.create(:name => "Orgao Autonomo")
		79	+ JuridicalNature.create(:name => "Sociedade")
		80	+ JuridicalNature.create(:name => "Sociedade Civil")
		81	+ JuridicalNature.create(:name => "Sociedade de Economia Mista")
		82	+
		83	+ national_region = NationalRegion.new
		84	+ national_region.name = "Distrito Federal"
		85	+ national_region.national_region_code = '35'
		86	+ national_region.national_region_type_id = NationalRegionType::STATE
		87	+ national_region.save
		88	+end
		89	+
		90	+Given /^the following organization ratings$/ do \|table\|
		91	+ table.hashes.each do \|item\|
		92	+ person = User.where(login: item[:user_login]).first.person
		93	+ organization = Organization.where(name: item[:organization_name]).first
		94	+
		95	+ rating = OrganizationRating.new
		96	+ rating.value = item[:value]
		97	+ rating.organization_id = organization.id
		98	+ rating.person_id = person.id
		99	+ rating.saved_value = item[:saved_value]
		100	+ rating.institution_id = Institution.where(name: item[:institution_name]).first.id
		101	+ rating.save
		102	+
		103	+ comment_task = CreateOrganizationRatingComment.create!(
		104	+ :body => "empty comment",
		105	+ :requestor => person,
		106	+ :organization_rating_id => rating.id,
		107	+ :target => organization)
		108	+
		109	+ comment_task.status = item[:task_status]
		110	+ comment_task.save
		111	+ end
		112	+end
		113	+
67	Given /^the following public institutions?$/ do \|table\|	114	Given /^the following public institutions?$/ do \|table\|
68	# table is a Cucumber::Ast::Table	115	# table is a Cucumber::Ast::Table
69	table.hashes.each do \|item\|	116	table.hashes.each do \|item\|
	@@ -247,3 +294,7 @@ end		@@ -247,3 +294,7 @@ end
247	Then /^there should be (\d+) divs? with class "([^"]*)"$/ do \|count, klass\|	294	Then /^there should be (\d+) divs? with class "([^"]*)"$/ do \|count, klass\|
248	should have_selector("div.#{klass}", :count => count)	295	should have_selector("div.#{klass}", :count => count)
249	end	296	end
		297	+
		298	+Given /^I should see "([^"]*)" in the page/ do \|message\|
		299	+ assert_match message, page.body
		300	+end
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+require_dependency "application_helper"
	2	+
	3	+ApplicationHelper.class_eval do
	4	+
	5	+ def number_to_human(value)
	6	+ number_with_delimiter(value, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter)
	7	+ end
	8	+end
	@@ -18,7 +18,7 @@ class Community		@@ -18,7 +18,7 @@ class Community
18	community = Community.new(attributes)	18	community = Community.new(attributes)
19		19
20	if community.environment.enabled?('admin_must_approve_new_communities') &&	20	if community.environment.enabled?('admin_must_approve_new_communities') &&
21	- !community.environment.admins.include?(requestor)	21	+ !community.is_admin?(requestor)
22		22
23	cc = CreateCommunity.create(attributes.merge(:requestor => requestor))	23	cc = CreateCommunity.create(attributes.merge(:requestor => requestor))
24	else	24	else
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+require_dependency "create_organization_rating_comment"
	2	+
	3	+CreateOrganizationRatingComment.class_eval do
	4	+ after_save :update_software_statistic
	5	+
	6	+ def update_software_statistic
	7	+ if(self.status == Task::Status::FINISHED)
	8	+ rating = OrganizationRating.find_by_id(self.organization_rating_id)
	9	+ software = SoftwareInfo.find_by_community_id(self.target_id)
	10	+ if software.present? and rating.present?
	11	+ software.saved_resources += rating.saved_value if rating.saved_value
	12	+ software.benefited_people += rating.people_benefited if rating.people_benefited
	13	+ software.save
	14	+ end
	15	+ end
	16	+ end
	17	+end
	@@ -100,14 +100,38 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin		@@ -100,14 +100,38 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin
100	Proc::new do "<h1 class='title'>#{title}</h1>" end	100	Proc::new do "<h1 class='title'>#{title}</h1>" end
101	end	101	end
102		102
103	- def organization_ratings_plugin_extra_fields_show_data user_rating	103	+ def organization_ratings_plugin_container_extra_fields user_rating
104	Proc::new {	104	Proc::new {
105	if logged_in?	105	if logged_in?
106	- is_admin = environment.admins.include?(current_user.person)
107	- is_admin \|\|= user_rating.organization.admins.include?(current_user.person)	106	+ is_admin = user.is_admin? \|\| user_rating.organization.is_admin?(user)
108		107
109	if is_admin and profile.software?	108	if is_admin and profile.software?
110	- render :file => 'organization_ratings_extra_fields_show_data',	109	+
		110	+ render :file => 'organization_ratings_container_extra_fields_show_statistics',
		111	+ :locals => {:user_rating => user_rating}
		112	+ end
		113	+ end
		114	+ }
		115	+ end
		116	+
		117	+ def organization_ratings_plugin_rating_created rating, params
		118	+ if params[:organization_rating].present? && (params[:organization_rating][:people_benefited].present? \|\|
		119	+ params[:organization_rating][:saved_value].present?)
		120	+ CreateOrganizationRatingComment.create!(
		121	+ :requestor => rating.person,
		122	+ :organization_rating_id => rating.id,
		123	+ :target => rating.organization) unless params[:comments] && params[:comments][:body].present?
		124	+ end
		125	+ end
		126	+
		127	+ def organization_ratings_plugin_task_extra_fields user_rating
		128	+ Proc::new {
		129	+ if logged_in?
		130	+ is_admin = user.is_admin? \|\| user_rating.organization.is_admin?(user)
		131	+
		132	+ if is_admin and profile.software?
		133	+
		134	+ render :file => 'organization_ratings_task_extra_fields_show_statistics',
111	:locals => {:user_rating => user_rating}	135	:locals => {:user_rating => user_rating}
112	end	136	end
113	end	137	end
	@@ -166,7 +166,7 @@ class SoftwareInfo < ActiveRecord::Base		@@ -166,7 +166,7 @@ class SoftwareInfo < ActiveRecord::Base
166	another_license_link = attributes.delete(:another_license_link)	166	another_license_link = attributes.delete(:another_license_link)
167		167
168	software_info = SoftwareInfo.new(attributes)	168	software_info = SoftwareInfo.new(attributes)
169	- unless environment.admins.include? requestor	169	+ if !requestor.is_admin?
170	CreateSoftware.create!(	170	CreateSoftware.create!(
171	attributes.merge(	171	attributes.merge(
172	:requestor => requestor,	172	:requestor => requestor,