Merge branch 'r4' into 'master'

R4 See merge request !7

Merge branch 'r4' into 'master'
R4 See merge request !7
Thiago Ribeiro
2 parents 4b1bc16f b0dcf7bd
Showing 17 changed files with 108 additions and 120 deletions Show diff stats
db/migrate/20150714123613_add_institution_to_comments.rb
db/migrate/20150814192230_add_institution_id_to_create_community_rating_comment.rb
db/migrate/20150910135510_add_siorg_code_to_institution.rb
db/migrate/20150910203559_add_institution_to_organization_rating.rb
lib/ext/comment.rb
lib/ext/organization_rating.rb
lib/gov_user_plugin.rb
lib/institution.rb
lib/private_institution.rb
lib/public_institution.rb
test/unit/comment_test.rb
test/unit/organization_rating_test.rb
test/unit/private_institution_test.rb
views/comments_extra_field.html.erb
views/communities_ratings_extra_fields_show_institution.html.erb
views/organization_ratings_extra_fields_show_institution.html.erb
views/ratings_extra_field.html.erb
@@ -1,11 +0,0 @@
-class AddInstitutionToComments < ActiveRecord::Migration
-  def up
-    change_table :comments do |t|
-      t.belongs_to :institution
-    end
-  end
-
-  def down
-    remove_column :comments, :institution_id
-  end
-end
@@ -1,11 +0,0 @@
-class AddInstitutionIdToCreateCommunityRatingComment < ActiveRecord::Migration
-  def up
-    change_table :tasks do |t|
-      t.belongs_to :institution
-    end
-  end
-
-  def down
-    remove_column :tasks, :institution_id
-  end
-end
@@ -0,0 +1,9 @@
+class AddSiorgCodeToInstitution < ActiveRecord::Migration
+  def up
+    add_column :institutions, :siorg_code, :integer
+  end
+
+  def down
+    remove_column :institutions, :siorg_code
+  end
+end
@@ -0,0 +1,11 @@
+class AddInstitutionToOrganizationRating < ActiveRecord::Migration
+  def up
+    change_table :organization_ratings do |t|
+      t.belongs_to :institution
+    end
+  end
+
+  def down
+    remove_column :organization_ratings, :institution_id
+  end
+end
 \ No newline at end of file
@@ -1,18 +0,0 @@
-require_dependency "comment"
-
-Comment.class_eval do
-  attr_accessible :institution_id
-
-  belongs_to :institution
-
-  validate :verify_institution
-
-  private
-
-    def verify_institution
-      if self.institution_id != nil
-        institution = Institution.find_by_id self.institution_id
-        self.errors.add :institution, _("not found") unless institution
-      end
-    end
-end
@@ -0,0 +1,20 @@
+require_dependency "organization_rating"
+
+OrganizationRating.class_eval do
+
+  belongs_to :institution
+
+  attr_accessible :institution, :institution_id
+
+  validate :verify_institution
+
+  private
+
+  def verify_institution
+    if self.institution != nil
+      institution = Institution.find_by_id self.institution.id
+      self.errors.add :institution, _("not found") unless institution
+    end
+  end
+
+end
@@ -231,18 +231,18 @@ class GovUserPlugin &lt; Noosfero::Plugin
     end
   end
-  def communities_ratings_plugin_comments_extra_fields
-    Proc::new do render :file => 'comments_extra_field' end
+  def organization_ratings_plugin_comments_extra_fields
+    Proc::new do render :file => 'ratings_extra_field' end
   end
-  def communities_ratings_plugin_extra_fields_show_data user_rating
+  def organization_ratings_plugin_extra_fields_show_data user_rating
     if logged_in?
       is_admin = environment.admins.include?(current_user.person)
-      is_admin ||= user_rating.community.admins.include?(current_user.person)
+      is_admin ||= user_rating.organization.admins.include?(current_user.person)
       if is_admin and context.profile.software?
         Proc::new {
-          render :file => 'communities_ratings_extra_fields_show_institution',
+          render :file => 'organization_ratings_extra_fields_show_institution',
                  :locals => {:user_rating => user_rating}
         }
       end
@@ -20,10 +20,9 @@ class Institution &lt; ActiveRecord::Base
                   :sub_juridical_nature, :normalization_level,
                   :version, :cnpj, :type, :governmental_power,
                   :governmental_sphere, :sisp, :juridical_nature,
-                  :corporate_name
+                  :corporate_name, :siorg_code, :community
   validates :name, :presence=>true, :uniqueness=>true
-  validates :cnpj, :uniqueness=>true
   before_save :verify_institution_type
 class PrivateInstitution < Institution
-  validates :cnpj, :uniqueness=>true, :allow_nil=>true, :allow_blank=>true
 end
@@ -5,8 +5,6 @@ class PublicInstitution &lt; Institution
   validates :acronym, :allow_blank => true, :allow_nil => true,
             :uniqueness=>true
-  validates :cnpj, :uniqueness=>true
-
   validates_format_of(
     :cnpj,
     :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/,
@@ -1,37 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class CommentTest < ActiveSupport::TestCase
-  include PluginTestHelper
-
-  should "validate institution if there an institution_id" do
-    private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
-
-    assert_equal true, private_institution.save
-
-    comment = Comment.new :institution_id => 123456, :body => "simple body"
-    comment.valid?
-
-    assert_equal true, comment.errors[:institution].include?("not found")
-
-    comment.institution = private_institution
-    comment.valid?
-
-    assert_equal false, comment.errors[:institution].include?("not found")
-  end
-
-  private
-
-  def build_private_institution name, corporate_name, cnpj, country="AR"
-    community = Community.new :name => name
-    community.country = country
-
-    institution = PrivateInstitution.new :name=> name
-    institution.corporate_name = corporate_name
-    institution.cnpj = cnpj
-    institution.community = community
-
-    institution
-  end
-end
-
@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../helpers/plugin_test_helper'
+
+class OrganizationRatingTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
+  def setup
+    @environment = Environment.default
+    @environment.enabled_plugins = ['SoftwareCommunitiesPlugin']
+    @environment.save
+  end
+
+  should "validate institution if there is an institution_id" do
+    person = fast_create(Person)
+    community = fast_create(Community)
+    private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
+
+    community_rating = OrganizationRating.new(:person => person, :value => 3, :organization => community, :institution => private_institution)
+    assert_equal false, community_rating.valid?
+
+    assert_equal true, community_rating.errors[:institution].include?("not found")
+
+    private_institution.save
+    community_rating.institution = private_institution
+
+    assert_equal true, community_rating.valid?
+    assert_equal false, community_rating.errors[:institution].include?("not found")
+  end
+
+  private
+
+  def build_private_institution name, corporate_name, cnpj, country="AR"
+    community = Community.new :name => name
+    community.country = country
+
+    institution = PrivateInstitution.new :name=> name
+    institution.corporate_name = corporate_name
+    institution.cnpj = cnpj
+    institution.community = community
+
+    institution
+  end
+end
+
@@ -25,21 +25,6 @@ class PrivateInstitutionTest &lt; ActiveSupport::TestCase
     assert @institution.save
   end
-  should "not save with a repeated cnpj" do
-    msg = "Cnpj has already been taken"
-    assert @institution.save
-    sec_institution = create_private_institution(
-                        "Another Private Institution",
-                        "API",
-                        "BR",
-                        "DF",
-                        "Gama",
-                        "00.000.000/0001-00"
-                      )
-
-    assert sec_institution.errors.full_messages.include? msg
-  end
-
   should "save without fantasy name" do
     @institution.acronym = nil
     @institution.community.save
@@ -1,10 +0,0 @@
-<div id="input_institution_comments">
-  <%= label_tag "input_institution", _("Organization name or Enterprise name")%>
-  <span class="star-tooltip" title="Órgão ou Empresa que você representa e utiliza o software"></span>
-  <input type="text" id="input_institution">
-
-  <%= content_tag(:div, _("No institution found"),
-                  :id=>"institution_empty_ajax_message",
-                  :class=>"errorExplanation hide-field") %>
-  <%= hidden_field_tag "comments[institution_id]", "", id: "institution_selected" %>
-</div>
@@ -1,8 +0,0 @@
-<% if user_rating.comment and user_rating.comment.institution %>
-<div class="aditional-informations">
-  <div class="comments-user-institution">
-    <span>Institution :<span> <%= user_rating.comment.institution.name unless user_rating.comment.nil? %>
-  </div>
-</div>
-<% end %>
-
@@ -0,0 +1,8 @@
+<% if user_rating.institution %>
+<div class="aditional-informations">
+  <div class="comments-user-institution">
+    <span>Institution :<span> <%= user_rating.institution.name unless user_rating.institution.nil? %>
+  </div>
+</div>
+<% end %>
+
@@ -0,0 +1,10 @@
+<div id="input_institution_comments">
+  <%= label_tag "input_institution", _("Organization name or Enterprise name")%>
+  <span class="star-tooltip" title="Órgão ou Empresa que você representa e utiliza o software"></span>
+  <input type="text" id="input_institution">
+
+  <%= content_tag(:div, _("No institution found"),
+                  :id=>"institution_empty_ajax_message",
+                  :class=>"errorExplanation hide-field") %>
+  <%= hidden_field_tag "organization_rating[institution_id]", "", id: "institution_selected" %>
+</div>
	@@ -1,11 +0,0 @@	@@ -1,11 +0,0 @@
1	-class AddInstitutionToComments < ActiveRecord::Migration
2	- def up
3	- change_table :comments do \|t\|
4	- t.belongs_to :institution
5	- end
6	- end
7	-
8	- def down
9	- remove_column :comments, :institution_id
10	- end
11	-end
	@@ -1,11 +0,0 @@	@@ -1,11 +0,0 @@
1	-class AddInstitutionIdToCreateCommunityRatingComment < ActiveRecord::Migration
2	- def up
3	- change_table :tasks do \|t\|
4	- t.belongs_to :institution
5	- end
6	- end
7	-
8	- def down
9	- remove_column :tasks, :institution_id
10	- end
11	-end
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class AddSiorgCodeToInstitution < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :institutions, :siorg_code, :integer
	4	+ end
	5	+
	6	+ def down
	7	+ remove_column :institutions, :siorg_code
	8	+ end
	9	+end
	@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
		1	+class AddInstitutionToOrganizationRating < ActiveRecord::Migration
		2	+ def up
		3	+ change_table :organization_ratings do \|t\|
		4	+ t.belongs_to :institution
		5	+ end
		6	+ end
		7	+
		8	+ def down
		9	+ remove_column :organization_ratings, :institution_id
		10	+ end
		11	+end
0	\ No newline at end of file	12	\ No newline at end of file
	@@ -1,18 +0,0 @@	@@ -1,18 +0,0 @@
1	-require_dependency "comment"
2	-
3	-Comment.class_eval do
4	- attr_accessible :institution_id
5	-
6	- belongs_to :institution
7	-
8	- validate :verify_institution
9	-
10	- private
11	-
12	- def verify_institution
13	- if self.institution_id != nil
14	- institution = Institution.find_by_id self.institution_id
15	- self.errors.add :institution, _("not found") unless institution
16	- end
17	- end
18	-end
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+require_dependency "organization_rating"
	2	+
	3	+OrganizationRating.class_eval do
	4	+
	5	+ belongs_to :institution
	6	+
	7	+ attr_accessible :institution, :institution_id
	8	+
	9	+ validate :verify_institution
	10	+
	11	+ private
	12	+
	13	+ def verify_institution
	14	+ if self.institution != nil
	15	+ institution = Institution.find_by_id self.institution.id
	16	+ self.errors.add :institution, _("not found") unless institution
	17	+ end
	18	+ end
	19	+
	20	+end
1	class PrivateInstitution < Institution	1	class PrivateInstitution < Institution
2	- validates :cnpj, :uniqueness=>true, :allow_nil=>true, :allow_blank=>true
3	end	2	end
	@@ -1,37 +0,0 @@	@@ -1,37 +0,0 @@
1	-require File.dirname(__FILE__) + '/../../../../test/test_helper'
2	-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
3	-
4	-class CommentTest < ActiveSupport::TestCase
5	- include PluginTestHelper
6	-
7	- should "validate institution if there an institution_id" do
8	- private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
9	-
10	- assert_equal true, private_institution.save
11	-
12	- comment = Comment.new :institution_id => 123456, :body => "simple body"
13	- comment.valid?
14	-
15	- assert_equal true, comment.errors[:institution].include?("not found")
16	-
17	- comment.institution = private_institution
18	- comment.valid?
19	-
20	- assert_equal false, comment.errors[:institution].include?("not found")
21	- end
22	-
23	- private
24	-
25	- def build_private_institution name, corporate_name, cnpj, country="AR"
26	- community = Community.new :name => name
27	- community.country = country
28	-
29	- institution = PrivateInstitution.new :name=> name
30	- institution.corporate_name = corporate_name
31	- institution.cnpj = cnpj
32	- institution.community = community
33	-
34	- institution
35	- end
36	-end
37	-
@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
	1	+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
	2	+require File.expand_path(File.dirname(__FILE__)) + '/../helpers/plugin_test_helper'
	3	+
	4	+class OrganizationRatingTest < ActiveSupport::TestCase
	5	+ include PluginTestHelper
	6	+
	7	+ def setup
	8	+ @environment = Environment.default
	9	+ @environment.enabled_plugins = ['SoftwareCommunitiesPlugin']
	10	+ @environment.save
	11	+ end
	12	+
	13	+ should "validate institution if there is an institution_id" do
	14	+ person = fast_create(Person)
	15	+ community = fast_create(Community)
	16	+ private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
	17	+
	18	+ community_rating = OrganizationRating.new(:person => person, :value => 3, :organization => community, :institution => private_institution)
	19	+ assert_equal false, community_rating.valid?
	20	+
	21	+ assert_equal true, community_rating.errors[:institution].include?("not found")
	22	+
	23	+ private_institution.save
	24	+ community_rating.institution = private_institution
	25	+
	26	+ assert_equal true, community_rating.valid?
	27	+ assert_equal false, community_rating.errors[:institution].include?("not found")
	28	+ end
	29	+
	30	+ private
	31	+
	32	+ def build_private_institution name, corporate_name, cnpj, country="AR"
	33	+ community = Community.new :name => name
	34	+ community.country = country
	35	+
	36	+ institution = PrivateInstitution.new :name=> name
	37	+ institution.corporate_name = corporate_name
	38	+ institution.cnpj = cnpj
	39	+ institution.community = community
	40	+
	41	+ institution
	42	+ end
	43	+end
	44	+
	@@ -25,21 +25,6 @@ class PrivateInstitutionTest < ActiveSupport::TestCase		@@ -25,21 +25,6 @@ class PrivateInstitutionTest < ActiveSupport::TestCase
25	assert @institution.save	25	assert @institution.save
26	end	26	end
27		27
28	- should "not save with a repeated cnpj" do
29	- msg = "Cnpj has already been taken"
30	- assert @institution.save
31	- sec_institution = create_private_institution(
32	- "Another Private Institution",
33	- "API",
34	- "BR",
35	- "DF",
36	- "Gama",
37	- "00.000.000/0001-00"
38	- )
39	-
40	- assert sec_institution.errors.full_messages.include? msg
41	- end
42	-
43	should "save without fantasy name" do	28	should "save without fantasy name" do
44	@institution.acronym = nil	29	@institution.acronym = nil
45	@institution.community.save	30	@institution.community.save