Thiago Ribeiro · Thiago Ribeiro · Thiago Ribeiro · Álvaro Fernando Matos de Souza · Fabio Teixeira · Pedro de Lyra Pereira
Showing 18 changed files Show diff stats
.gitignore
db/migrate/20150714123613_add_institution_to_comments.rb
db/migrate/20150814192230_add_institution_id_to_create_community_rating_comment.rb
features/steps_definitions/gov_user_steps.rb
lib/ext/comment.rb
lib/ext/create_community_rating_comment.rb
lib/gov_user_plugin.rb
lib/institution.rb
public/initializer.js
public/views/create-institution.js
public/views/gov-user-comments-extra-fields.js
test/unit/comment_test.rb
test/unit/gov_user_person_test.rb
test/unit/institution_test.rb
views/comments_extra_field.html.erb
views/communities_ratings_extra_fields_show_institution.html.erb
views/gov_user_plugin/_institution.html.erb
views/gov_user_plugin_myprofile/edit_institution.html.erb
@@ -0,0 +1,2 @@
+*.swp
+
@@ -0,0 +1,11 @@
+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
@@ -0,0 +1,11 @@
+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
@@ -66,7 +66,6 @@ Given /^the following public institutions?$/ do |table|
   end
 end
-
 Given /^I sleep for (\d+) seconds$/ do |time|
   sleep time.to_i
 end
@@ -87,4 +86,5 @@ Given /^I am logged in as mpog_admin$/ do
   fill_in("Username", :with => user.login)
   fill_in("Password", :with => '123456')
   click_button("Log in")
-end
 \ No newline at end of file
+end
+
@@ -0,0 +1,18 @@
+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,6 @@
+require_dependency "create_community_rating_comment"
+
+CreateCommunityRatingComment.class_eval do
+  attr_accessible :institution_id
+end
+
@@ -153,6 +153,7 @@ class GovUserPlugin &lt; Noosfero::Plugin
     views/create-institution.js
     views/new-community.js
     views/user-edit-profile.js
+    views/gov-user-comments-extra-fields.js
     initializer.js
     app.js
     )
@@ -232,6 +233,24 @@ class GovUserPlugin &lt; Noosfero::Plugin
     end
   end
+  def communities_ratings_plugin_comments_extra_fields
+    Proc::new do render :file => 'comments_extra_field' end
+  end
+
+  def communities_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)
+
+      if is_admin and context.profile.software?
+        Proc::new {
+          render :file => 'communities_ratings_extra_fields_show_institution',
+                 :locals => {:user_rating => user_rating}
+        }
+      end
+    end
+  end
+
   private
   def call_model_transaction(model,name)
 class Institution < ActiveRecord::Base
+  has_many :comments
   SEARCH_FILTERS = {
     :order => %w[],
@@ -6,7 +6,8 @@
     'CreateInstitution',
     'CompleteRegistration',
     'UserEditProfile',
-    'NewCommunity'
+    'NewCommunity',
+    'GovUserCommentsExtraFields'
   ];
@@ -398,6 +398,10 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     init: function() {
       set_form_count_custom_data();
       set_events();
+    },
+    
+    institution_autocomplete: function(){
+      institution_autocomplete();
     }
   }
 });
@@ -0,0 +1,26 @@
+modulejs.define("GovUserCommentsExtraFields", ['jquery','CreateInstitution'], function($,CreateInstitution) {
+
+    function set_events() {
+      CreateInstitution.institution_autocomplete();
+    }
+
+
+    function prepend_to_additional_information() {
+      var institution_comments = $("#input_institution_comments").remove();
+
+      $(".comments-software-extra-fields").prepend(institution_comments);
+    }
+
+
+    return {
+      isCurrentPage: function() {
+        return $(".star-rate-form").length === 1;
+      },
+
+      init: function() {
+        prepend_to_additional_information();
+        set_events();
+      }
+    }
+
+})
@@ -0,0 +1,37 @@
+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
+
@@ -15,6 +15,7 @@ class SoftwareCommunitiesPluginPersonTest &lt; ActiveSupport::TestCase
                 "user@email.com",
                 "123456",
                 "123456",
+                "user2@email.com",
                 "Any State",
                 "Some City"
               )
@@ -29,34 +29,35 @@ class InstitutionTest &lt; ActiveSupport::TestCase
   end
   should "not save institutions without name" do
     @institution.name = nil
-    assert !@institution.save
-    assert @institution.errors.full_messages.include? "Name can't be blank"
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?("Name can't be blank")
   end
   should "not save if institution has invalid type" do
     invalid_msg = "Type invalid, only public and private institutions are allowed."
     @institution.type = "Other type"
-    assert !@institution.save, 'Invalid type'
-    assert @institution.errors.full_messages.include? invalid_msg
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?(invalid_msg)
   end
   should "not save without country" do
     @institution.community.country = nil
-    assert !@institution.save, "Country can't be blank"
-    assert @institution.errors.full_messages.include? "Country can't be blank"
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?("Country can't be blank")
   end
   should "not save without state" do
     @institution.community.state = nil
-    assert !@institution.save, "State can't be blank"
-    assert @institution.errors.full_messages.include? "State can't be blank"
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?("State can't be blank")
   end
   should "not save without city" do
     @institution.community.city = nil
+    @institution.community.state = "DF"
-    assert !@institution.save, "City can't be blank"
-    assert @institution.errors.full_messages.include? "City can't be blank"
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?("City can't be blank")
   end
 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 "comments[institution_id]", "", id: "institution_selected" %>
+</div>
@@ -0,0 +1,8 @@
+<% 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 %>
+
@@ -24,10 +24,7 @@
 <div>
   <%= labelled_form_for :community, :url => {:action=>"new_institution"}, :html => { :multipart => true, :id=>"institution_form" } do |f| %>
-    <div class="fields-required">
-      <span class="errorExplanation"><%= required_fields_message %></span>
-    </div>
-    <br/>
+    <%= required_fields_message %>
     <%= hidden_field_tag "edit_institution_page", false %>
     <%= fields_for :institutions do |inst| %>
       <span class=''>
@@ -114,7 +111,6 @@
           <% end %>
           </div>
       </span>
-      <br />
       <% if @url_token == "create_institution_admin" %>
         <%= submit_button :save, _('Save') %>
@@ -23,7 +23,6 @@
   <div class="fields-required">
     <span class="errorExplanation"><%= _("All fields with (*) are mandatory") %></span>
   </div>
-  <br/>
   <%= labelled_form_for :community,:html => { :multipart => true, :id=>"institution_form" } do |f| %>
     <%= hidden_field_tag "edit_institution_page", true %>
     <%= fields_for :institutions do |inst| %>
@@ -111,7 +110,6 @@
           <% end %>
           </div>
       </span>
-      <br />
     <%= submit_button :save, _('Save') %>
   <% end %>
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	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
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	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,18 @@		@@ -0,0 +1,18 @@
	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,6 @@		@@ -0,0 +1,6 @@
	1	+require_dependency "create_community_rating_comment"
	2	+
	3	+CreateCommunityRatingComment.class_eval do
	4	+ attr_accessible :institution_id
	5	+end
	6	+
	@@ -153,6 +153,7 @@ class GovUserPlugin < Noosfero::Plugin		@@ -153,6 +153,7 @@ class GovUserPlugin < Noosfero::Plugin
153	views/create-institution.js	153	views/create-institution.js
154	views/new-community.js	154	views/new-community.js
155	views/user-edit-profile.js	155	views/user-edit-profile.js
		156	+ views/gov-user-comments-extra-fields.js
156	initializer.js	157	initializer.js
157	app.js	158	app.js
158	)	159	)
	@@ -232,6 +233,24 @@ class GovUserPlugin < Noosfero::Plugin		@@ -232,6 +233,24 @@ class GovUserPlugin < Noosfero::Plugin
232	end	233	end
233	end	234	end
234		235
		236	+ def communities_ratings_plugin_comments_extra_fields
		237	+ Proc::new do render :file => 'comments_extra_field' end
		238	+ end
		239	+
		240	+ def communities_ratings_plugin_extra_fields_show_data user_rating
		241	+ if logged_in?
		242	+ is_admin = environment.admins.include?(current_user.person)
		243	+ is_admin \|\|= user_rating.community.admins.include?(current_user.person)
		244	+
		245	+ if is_admin and context.profile.software?
		246	+ Proc::new {
		247	+ render :file => 'communities_ratings_extra_fields_show_institution',
		248	+ :locals => {:user_rating => user_rating}
		249	+ }
		250	+ end
		251	+ end
		252	+ end
		253	+
235	private	254	private
236		255
237	def call_model_transaction(model,name)	256	def call_model_transaction(model,name)
1	class Institution < ActiveRecord::Base	1	class Institution < ActiveRecord::Base
		2	+ has_many :comments
2		3
3	SEARCH_FILTERS = {	4	SEARCH_FILTERS = {
4	:order => %w[],	5	:order => %w[],
	@@ -6,7 +6,8 @@		@@ -6,7 +6,8 @@
6	'CreateInstitution',	6	'CreateInstitution',
7	'CompleteRegistration',	7	'CompleteRegistration',
8	'UserEditProfile',	8	'UserEditProfile',
9	- 'NewCommunity'	9	+ 'NewCommunity',
		10	+ 'GovUserCommentsExtraFields'
10	];	11	];
11		12
12		13
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+modulejs.define("GovUserCommentsExtraFields", ['jquery','CreateInstitution'], function($,CreateInstitution) {
	2	+
	3	+ function set_events() {
	4	+ CreateInstitution.institution_autocomplete();
	5	+ }
	6	+
	7	+
	8	+ function prepend_to_additional_information() {
	9	+ var institution_comments = $("#input_institution_comments").remove();
	10	+
	11	+ $(".comments-software-extra-fields").prepend(institution_comments);
	12	+ }
	13	+
	14	+
	15	+ return {
	16	+ isCurrentPage: function() {
	17	+ return $(".star-rate-form").length === 1;
	18	+ },
	19	+
	20	+ init: function() {
	21	+ prepend_to_additional_information();
	22	+ set_events();
	23	+ }
	24	+ }
	25	+
	26	+})
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	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,10 @@		@@ -0,0 +1,10 @@
	1	+<div id="input_institution_comments">
	2	+ <%= label_tag "input_institution", _("Organization name or Enterprise name")%>
	3	+ <span class="star-tooltip" title="Órgão ou Empresa que você representa e utiliza o software"></span>
	4	+ <input type="text" id="input_institution">
	5	+
	6	+ <%= content_tag(:div, _("No institution found"),
	7	+ :id=>"institution_empty_ajax_message",
	8	+ :class=>"errorExplanation hide-field") %>
	9	+ <%= hidden_field_tag "comments[institution_id]", "", id: "institution_selected" %>
	10	+</div>