Removing Users attributes and validations. Now, if you need to use secondary_ema…

…il or other attribute you need to enable the specific user plugin Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Removing Users attributes and validations. Now, if you need to use secondary_ema…
…il or other attribute you need to enable the specific user plugin Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Gabriela Navarro · Arthur Esposte
1 parent 34c2b8b6
Showing 16 changed files with 14 additions and 437 deletions Show diff stats
db/migrate/20150408130613_remove_secondary_email_from_user.rb
features/user_profile_edition.feature
lib/ext/person.rb
lib/ext/user.rb
lib/software_communities_plugin.rb
public/initializer.js
public/style.css
public/views/complete-registration.js
test/helpers/plugin_test_helper.rb
test/unit/communities_block_test.rb
test/unit/institutions_block_test.rb
test/unit/software_communities_person_test.rb
test/unit/software_communities_plugin_user_test.rb
test/unit/softwares_block_test.rb
views/incomplete_registration.html.erb
views/person_editor_extras.html.erb
@@ -0,0 +1,10 @@
+class RemoveSecondaryEmailFromUser < ActiveRecord::Migration
+  def up
+    remove_column :users, :secondary_email
+  end
+
+  def down
+    add_column :users, :secondary_email
+  end
+
+end
@@ -23,11 +23,6 @@ Feature: Institution Field
       | Ministerio do Planejamento | MP      | BR      | DF    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
     And I am logged in as mpog_admin
  
-  Scenario: Go to control panel when clicked on 'Complete your profile' link
-    When I follow "Complete your profile"
-    Then I should see "Profile settings for "
-    And I should see "Personal information"
-
   @selenium
   Scenario: Add more then one instituion on profile editor
     Given I follow "Edit Profile"
@@ -40,11 +35,6 @@ Feature: Institution Field
     And I should see "Governo do DF" within ".institutions_added"
  
   @selenium
-  Scenario: Verify text information to use governmental e-mail
-    Given I follow "Edit Profile"
-    Then I should see "If you work in a public agency use your government e-Mail"
-
-  @selenium
   Scenario: Verify if field 'city' is shown when Brazil is selected
     Given I follow "Edit Profile"
     Then I should see "City"
@@ -61,4 +51,3 @@ Feature: Institution Field
     And I fill in "input_institution" with "Some Nonexistent Institution"
     And I sleep for 1 seconds
     Then I should see "No institution found"
-
@@ -4,10 +4,6 @@ require_dependency &#39;person&#39;
  
 class Person
  
-  settings_items :percentage_incomplete, :type => :string, :default => ""
-
-  attr_accessible :percentage_incomplete
-
   delegate :login, :to => :user, :prefix => true
  
   def institutions
@@ -20,14 +16,6 @@ class Person
     institutions
   end
  
-  def secondary_email
-    self.user.secondary_email unless self.user.nil?
-  end
-
-  def secondary_email= value
-    self.user.secondary_email = value unless self.user.nil?
-  end
-
   def software?
     false
   end
@@ -2,89 +2,6 @@ require_dependency &#39;user&#39;
  
 class User
  
-  GOV_SUFFIX = /^.*@[gov.br|jus.br|leg.br|mp.br]+$/
-
   has_and_belongs_to_many :institutions
  
-  validate :email_different_secondary?, :email_has_already_been_used?,
-           :secondary_email_format, :email_suffix_is_gov?
-
-  scope :primary_or_secondary_email_already_used?, lambda { |email|
-    where("email=? OR secondary_email=?", email, email)
-  }
-
-  def email_different_secondary?
-    self.errors.add(
-      :base,
-      _("Email must be different from secondary email.")
-    ) if self.email == self.secondary_email
-  end
-
-  def email_has_already_been_used?
-    user_already_saved = User.find(:first,
-                                   :conditions => ["email = ?", self.email])
-
-    if user_already_saved.nil?
-      primary_email_hasnt_been_used =
-        User.primary_or_secondary_email_already_used?(self.email).empty?
-
-      if !self.secondary_email.nil? and self.secondary_email.empty?
-        self.secondary_email = nil
-      end
-
-      secondary_email_hasnt_been_used =
-        User.primary_or_secondary_email_already_used?(self.secondary_email).
-          empty?
-
-      if !primary_email_hasnt_been_used or !secondary_email_hasnt_been_used
-        self.errors.add(:base, _("E-mail or secondary e-mail already taken."))
-      end
-    end
-  end
-
-  def secondary_email_format
-    if !self.secondary_email.nil? and self.secondary_email.length > 0
-      test = /\A[^@]+@([^@\.]+\.)+[^@\.]+\z/
-
-      unless test.match(self.secondary_email)
-        self.errors.add(:base, _("Invalid secondary email format."))
-      end
-    end
-  end
-
-  def email_suffix_is_gov?
-    check_gov_suffix_in_secondary_email
-    check_gov_email_have_institution
-  end
-
-  private
-
-  def valid_format?(value, string_format)
-    !value.nil? && value.length > 0 && !string_format.match(value).nil?
-  end
-
-  def check_gov_suffix_in_secondary_email
-    unless primary_email_has_gov_suffix?
-      self.errors.add(
-        :base,
-        _("The governamental email must be the primary one.")
-      ) if secondary_email_has_gov_suffix?
-    end
-  end
-
-  def check_gov_email_have_institution
-    self.errors.add(
-      :base,
-       _("Institution is obligatory if user has a government email.")
-    ) if primary_email_has_gov_suffix? && self.institutions.blank?
-  end
-
-  def primary_email_has_gov_suffix?
-    valid_format?(self.email, GOV_SUFFIX)
-  end
-
-  def secondary_email_has_gov_suffix?
-    valid_format?(self.secondary_email, GOV_SUFFIX)
-  end
-
-end
 \ No newline at end of file
+end
@@ -17,22 +17,6 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
     _('Add Public Software and MPOG features.')
   end
  
-  # Hotspot to insert html without an especific hotspot on view.
-  def body_beginning
-    return if context.session[:user].nil? or context.session[:hide_incomplete_percentage] == true
-
-    person = context.environment.people.where(:user_id=>context.session[:user]).first
-
-    if context.profile && context.profile.person? and !person.nil?
-      @person = person
-      @percentege = calc_percentage_registration(person)
-
-      if @percentege >= 0 and @percentege < 100
-        expanded_template('incomplete_registration.html.erb')
-      end
-    end
-  end
-
   def profile_editor_extras
     profile = context.profile
  
@@ -125,7 +109,6 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
       views/new-software.js
       views/user-edit-profile.js
       views/create-institution.js
-      views/complete-registration.js
       views/search-software-catalog.js
       views/profile-tabs-software.js
       views/new-community.js
@@ -152,17 +135,6 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
     end
   end
  
-  def calc_percentage_registration(person)
-    required_list = profile_required_list
-    empty_fields = profile_required_empty_list person
-    count = required_list[:person_fields].count +
-            required_list[:user_fields].count
-    percentege = 100 - ((empty_fields.count * 100) / count)
-    person.percentage_incomplete = percentege
-    person.save(validate: false)
-    percentege
-  end
-
   def admin_panel_links
     [
       {
@@ -177,37 +149,6 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
  
   protected
  
-  def profile_required_list
-    fields = {}
-    fields[:person_fields] = %w(cell_phone
-                                contact_phone
-                                comercial_phone
-                                country
-                                city
-                                state
-                                organization_website
-                                image
-                                identifier
-                                name)
-
-    fields[:user_fields] = %w(secondary_email email)
-    fields
-  end
-
-
-  def profile_required_empty_list(person)
-    empty_fields = []
-    required_list = profile_required_list
-
-    required_list[:person_fields].each do |field|
-      empty_fields << field.sub('_',' ') if person.send(field).blank?
-    end
-    required_list[:user_fields].each do |field|
-      empty_fields << field.sub('_',' ') if person.user.send(field).blank?
-    end
-    empty_fields
-  end
-
   def user_transaction
     user_editor_institution_actions
  
@@ -7,7 +7,6 @@
     'NewSoftware',
     'UserEditProfile',
     'CreateInstitution',
-    'CompleteRegistration',
     'SearchSoftwareCatalog',
     'SoftwareDownload',
     'ProfileTabsSoftware',
@@ -38,27 +38,6 @@
   width: 180px;
 }
  
-#complete_registration {
-  padding: 5px;
-  width: 100%;
-  background-color: #fff;
-}
-
-#complete_registration a {
-  text-decoration: none;
-}
-
-#complete_registration a:hover {
-  font-weight: bold;
-}
-
-#complete_registration_percentage {
-  width: 100%;
-  height: 20px;
-  background: #fff;
-  border: solid 1px #000;
-}
-
 #profile-data .invalid {
   border-color: rgb(127, 0, 0);
   box-shadow: 0px 0px 7px red;
@@ -1,60 +0,0 @@
-modulejs.define('CompleteRegistration', ['jquery', 'NoosferoRoot'], function($, NoosferoRoot) {
-  'use strict';
-
-
-  var AJAX_URL = {
-    hide_registration_incomplete_percentage:
-      NoosferoRoot.urlWithSubDirectory("/plugin/software_communities/hide_registration_incomplete_percentage")
-  };
-
-
-  function hide_incomplete_percentage(evt) {
-    evt.preventDefault();
-
-    jQuery.get(AJAX_URL.hide_registration_incomplete_percentage, {hide:true}, function(response){
-      if( response === true ) {
-        jQuery("#complete_registration").fadeOut();
-      }
-    });
-  }
-
-
-  function show_complete_progressbar() {
-    var percentage = jQuery("#complete_registration_message span").html();
-    var canvas_tag = document.getElementById("complete_registration_percentage");
-
-    if( canvas_tag !== null ) {
-      var context = canvas_tag.getContext("2d");
-
-      percentage = canvas_tag.width*(percentage/100.0);
-
-      context.beginPath();
-      context.rect(0, 0, percentage, canvas_tag.height);
-      context.fillStyle = '#00FF00';
-      context.fill();
-    }
-  }
-
-
-  function repositioning_bar_percentage() {
-    var complete_message = $("#complete_registration").remove();
-
-    $(".profile-info-options").before(complete_message);
-  }
-
-
-  return {
-    isCurrentPage: function() {
-      return $("#complete_registration").length === 1;
-    },
-
-
-    init: function() {
-      repositioning_bar_percentage();
-
-      jQuery(".hide-incomplete-percentage").click(hide_incomplete_percentage);
-
-      show_complete_progressbar();
-    }
-  }
-});
 \ No newline at end of file
@@ -46,13 +46,12 @@ module PluginTestHelper
     community
   end
  
-  def create_person name, email, password, password_confirmation, secondary_email, state, city
+  def create_person name, email, password, password_confirmation, state, city
     user = create_user(
       name.to_slug,
       email,
       password,
       password_confirmation,
-      secondary_email
     )
     person = Person::new
  
@@ -70,14 +69,13 @@ module PluginTestHelper
     person
   end
  
-  def create_user login, email, password, password_confirmation, secondary_email
+  def create_user login, email, password, password_confirmation
     user = User.new
  
     user.login = login
     user.email = email
     user.password = password
     user.password_confirmation = password_confirmation
-    user.secondary_email = secondary_email
  
     user
   end
@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + &#39;/../helpers/plugin_test_helper&#39;
 class CommunitiesBlockTest < ActiveSupport::TestCase
   include PluginTestHelper
   def setup
-    @person = create_person("My Name", "user@email.com", "123456", "123456", "user@secondary_email.com", "Any State", "Some City")
+    @person = create_person("My Name", "user@email.com", "123456", "123456", "Any State", "Some City")
  
     @gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
     @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
@@ -27,7 +27,6 @@ class InstitutionsBlockTest &lt; ActiveSupport::TestCase
             "jose_augusto@email.com",
             "aaaaaaa",
             "aaaaaaa",
-            "jose_silva@email.com",
             "DF",
             "Gama"
           )
@@ -15,7 +15,6 @@ class SoftwareCommunitiesPluginPersonTest &lt; ActiveSupport::TestCase
                 "user@email.com",
                 "123456",
                 "123456",
-                "user@secondary_email.com",
                 "Any State",
                 "Some City"
               )
@@ -29,13 +28,6 @@ class SoftwareCommunitiesPluginPersonTest &lt; ActiveSupport::TestCase
     assert_kind_of Noosfero::Plugin, @plugin
   end
  
-
-  should 'return true when the email has not gov.br,jus.br,leg.br or mp.br' do
-    @user.secondary_email = "test_email@com.br"
-    @user.email = "test_email@net.br"
-    assert @user.save
-  end
-
   should 'save person with a valid full name' do
     p = Person::new :name=>"S1mpl3 0f N4m3", :identifier=>"simple-name"
     p.user = fast_create(:user)
@@ -63,23 +55,6 @@ class SoftwareCommunitiesPluginPersonTest &lt; ActiveSupport::TestCase
     assert !p.save , _("Name Should begin with a capital letter and no special characters")
   end
  
-  should 'calculate the percentege of person incomplete fields' do
-    @person.cell_phone = "76888919"
-    @person.contact_phone = "987654321"
-
-    assert_equal(67, @plugin.calc_percentage_registration(@person))
-
-    @person.comercial_phone = "11223344"
-    @person.country = "I dont know"
-    @person.state = "I dont know"
-    @person.city = "I dont know"
-    @person.organization_website = "www.whatever.com"
-    @person.image = Image::new :uploaded_data=>fixture_file_upload('/files/rails.png', 'image/png')
-    @person.save
-
-    assert_equal(100, @plugin.calc_percentage_registration(@person))
-  end
-
   should 'get a list of softwares of a person' do
     software1 = create_software_info "noosfero"
     software2 = create_software_info "colab"
@@ -1,138 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class SoftwareCommunitiesPluginUserTest < ActiveSupport::TestCase
-  include PluginTestHelper
-
-  should 'not save user whose both email and secondary email are the same' do
-
-    user = fast_create(User)
-    user.email = "test@email.com"
-    user.secondary_email = "test@email.com"
-
-    assert !user.save
-  end
-
-  should 'not save user whose email and secondary email have been taken' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.email = "primary@email.com"
-    user2.secondary_email = "secondary@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose email has already been used' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.email = "primary@email.com"
-    user2.secondary_email = "noosfero@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose email has been taken another in users secondary email' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.login = "another-login"
-    user2.email = "secondary@email.com"
-    user2.secondary_email = "noosfero@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose secondary email has been taken used in another users email' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.login = "another-login"
-    user2.email = "noosfero@email.com"
-    user2.secondary_email = "primary@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose secondary email has already been used in another users secondary email' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.login = "another-login"
-    user2.email = "noosfero@email.com"
-    user2.secondary_email = "secondary@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose secondary email is in the wrong format' do
-    user = fast_create(User)
-    user.email = "test@email.com"
-    user.secondary_email = "notarightformat.com"
-
-    assert !user.save
-
-    user.secondary_email = "not@arightformatcom"
-
-    assert !user.save
-  end
-
-  should 'save more than one user without secondary email' do
-    user = fast_create(User)
-    user.email = "test@email.com"
-    user.secondary_email = ""
-    user.save
-
-    user2 = fast_create(User)
-    user2.email = "test2@email.com"
-    user2.secondary_email = ""
-    assert user2.save
-  end
-  should 'return an error if secondary email is governmental and primary is not' do
-    invalid_msg = "The governamental email must be the primary one."
-    user = fast_create(User)
-
-    user.email = "test@email.com"
-    user.secondary_email = "test@gov.br"
-
-    assert !user.save
-    assert user.errors.full_messages.include?(invalid_msg)
-  end
-
-  should 'have institution if email is governmental' do
-    user = fast_create(User)
-
-    user.email = "testtest@gov.br"
-
-    user.institutions = []
-    assert !user.save, "this should not save"
-
-    gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
-    gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    juridical_nature = JuridicalNature.create(:name => "Autarquia")
-    institution = create_public_institution(
-                    "Ministerio Publico da Uniao",
-                    "MPU",
-                    "BR",
-                    "DF",
-                    "Gama",
-                    juridical_nature,
-                    gov_power,
-                    gov_sphere,
-                    "44.555.666/7777-88"
-                  )
-    institution.save!
-
-    user.institutions << institution
-    assert user.save, "this should save"
-  end
-
- private
-
-  def create_default_user
-    user = fast_create(User)
-    user.login = "a-login"
-    user.email = "primary@email.com"
-    user.secondary_email = "secondary@email.com"
-    user.save
-
-    return user
-  end
-
-end
@@ -27,7 +27,6 @@ class SoftwaresBlockTest &lt; ActiveSupport::TestCase
             "jose_augusto@email.com",
             "aaaaaaa",
             "aaaaaaa",
-            "jose_silva@email.com",
             "DF",
             "Gama"
           )
@@ -1,11 +0,0 @@
-<div id='complete_registration'>
-  <div id="complete_registration_message">
-    <div><%= _("Complete Profile")+": <span>#{@percentege}</span>%" %></div>
-      <canvas id="complete_registration_percentage" width="100%" height="20"></canvas>
-      <div>
-        <%= link_to _("Complete your profile"), "#{Noosfero.root}/myprofile/#{@person.identifier}/profile_editor/edit" %> |
-        <%= link_to _("Hide"), "#", :class=>"hide-incomplete-percentage" %>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="formfieldline">
-  <%= label_tag "user[secondary_email]", _('Secondary e-mail')+":", :class=>"formlabel" %>
-
-  <div class="formfield type-text">
-    <%= text_field_tag "user[secondary_email]", context.profile.user.secondary_email %>
-  </div>
-</div>
-
 <div class="formfieldline" id="select_institution">
   <%= label_tag "user[institution_ids]", _('Institutions'), :class=>"formlabel" %>
...	...	@@ -0,0 +1,10 @@
	1	+class RemoveSecondaryEmailFromUser < ActiveRecord::Migration
	2	+ def up
	3	+ remove_column :users, :secondary_email
	4	+ end
	5	+
	6	+ def down
	7	+ add_column :users, :secondary_email
	8	+ end
	9	+
	10	+end
...	...
...	...	@@ -23,11 +23,6 @@ Feature: Institution Field
23	23	\| Ministerio do Planejamento \| MP \| BR \| DF \| Brasilia \| 41.769.591/0001-43 \| Autarquia \| Judiciario \| Federal \| Ministerio do Planejamento \|
24	24	And I am logged in as mpog_admin
25	25
26		- Scenario: Go to control panel when clicked on 'Complete your profile' link
27		- When I follow "Complete your profile"
28		- Then I should see "Profile settings for "
29		- And I should see "Personal information"
30		-
31	26	@selenium
32	27	Scenario: Add more then one instituion on profile editor
33	28	Given I follow "Edit Profile"
...	...	@@ -40,11 +35,6 @@ Feature: Institution Field
40	35	And I should see "Governo do DF" within ".institutions_added"
41	36
42	37	@selenium
43		- Scenario: Verify text information to use governmental e-mail
44		- Given I follow "Edit Profile"
45		- Then I should see "If you work in a public agency use your government e-Mail"
46		-
47		- @selenium
48	38	Scenario: Verify if field 'city' is shown when Brazil is selected
49	39	Given I follow "Edit Profile"
50	40	Then I should see "City"
...	...	@@ -61,4 +51,3 @@ Feature: Institution Field
61	51	And I fill in "input_institution" with "Some Nonexistent Institution"
62	52	And I sleep for 1 seconds
63	53	Then I should see "No institution found"
64		-
...	...
...	...	@@ -4,10 +4,6 @@ require_dependency 'person'
4	4
5	5	class Person
6	6
7		- settings_items :percentage_incomplete, :type => :string, :default => ""
8		-
9		- attr_accessible :percentage_incomplete
10		-
11	7	delegate :login, :to => :user, :prefix => true
12	8
13	9	def institutions
...	...	@@ -20,14 +16,6 @@ class Person
20	16	institutions
21	17	end
22	18
23		- def secondary_email
24		- self.user.secondary_email unless self.user.nil?
25		- end
26		-
27		- def secondary_email= value
28		- self.user.secondary_email = value unless self.user.nil?
29		- end
30		-
31	19	def software?
32	20	false
33	21	end
...	...
...	...	@@ -2,89 +2,6 @@ require_dependency 'user'
2	2
3	3	class User
4	4
5		- GOV_SUFFIX = /^.*@[gov.br\|jus.br\|leg.br\|mp.br]+$/
6		-
7	5	has_and_belongs_to_many :institutions
8	6
9		- validate :email_different_secondary?, :email_has_already_been_used?,
10		- :secondary_email_format, :email_suffix_is_gov?
11		-
12		- scope :primary_or_secondary_email_already_used?, lambda { \|email\|
13		- where("email=? OR secondary_email=?", email, email)
14		- }
15		-
16		- def email_different_secondary?
17		- self.errors.add(
18		- :base,
19		- _("Email must be different from secondary email.")
20		- ) if self.email == self.secondary_email
21		- end
22		-
23		- def email_has_already_been_used?
24		- user_already_saved = User.find(:first,
25		- :conditions => ["email = ?", self.email])
26		-
27		- if user_already_saved.nil?
28		- primary_email_hasnt_been_used =
29		- User.primary_or_secondary_email_already_used?(self.email).empty?
30		-
31		- if !self.secondary_email.nil? and self.secondary_email.empty?
32		- self.secondary_email = nil
33		- end
34		-
35		- secondary_email_hasnt_been_used =
36		- User.primary_or_secondary_email_already_used?(self.secondary_email).
37		- empty?
38		-
39		- if !primary_email_hasnt_been_used or !secondary_email_hasnt_been_used
40		- self.errors.add(:base, _("E-mail or secondary e-mail already taken."))
41		- end
42		- end
43		- end
44		-
45		- def secondary_email_format
46		- if !self.secondary_email.nil? and self.secondary_email.length > 0
47		- test = /\A[^@]+@([^@\.]+\.)+[^@\.]+\z/
48		-
49		- unless test.match(self.secondary_email)
50		- self.errors.add(:base, _("Invalid secondary email format."))
51		- end
52		- end
53		- end
54		-
55		- def email_suffix_is_gov?
56		- check_gov_suffix_in_secondary_email
57		- check_gov_email_have_institution
58		- end
59		-
60		- private
61		-
62		- def valid_format?(value, string_format)
63		- !value.nil? && value.length > 0 && !string_format.match(value).nil?
64		- end
65		-
66		- def check_gov_suffix_in_secondary_email
67		- unless primary_email_has_gov_suffix?
68		- self.errors.add(
69		- :base,
70		- _("The governamental email must be the primary one.")
71		- ) if secondary_email_has_gov_suffix?
72		- end
73		- end
74		-
75		- def check_gov_email_have_institution
76		- self.errors.add(
77		- :base,
78		- _("Institution is obligatory if user has a government email.")
79		- ) if primary_email_has_gov_suffix? && self.institutions.blank?
80		- end
81		-
82		- def primary_email_has_gov_suffix?
83		- valid_format?(self.email, GOV_SUFFIX)
84		- end
85		-
86		- def secondary_email_has_gov_suffix?
87		- valid_format?(self.secondary_email, GOV_SUFFIX)
88		- end
89		-
90		-end
91	7	\ No newline at end of file
	8	+end
...	...
...	...	@@ -17,22 +17,6 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin
17	17	_('Add Public Software and MPOG features.')
18	18	end
19	19
20		- # Hotspot to insert html without an especific hotspot on view.
21		- def body_beginning
22		- return if context.session[:user].nil? or context.session[:hide_incomplete_percentage] == true
23		-
24		- person = context.environment.people.where(:user_id=>context.session[:user]).first
25		-
26		- if context.profile && context.profile.person? and !person.nil?
27		- @person = person
28		- @percentege = calc_percentage_registration(person)
29		-
30		- if @percentege >= 0 and @percentege < 100
31		- expanded_template('incomplete_registration.html.erb')
32		- end
33		- end
34		- end
35		-
36	20	def profile_editor_extras
37	21	profile = context.profile
38	22
...	...	@@ -125,7 +109,6 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin
125	109	views/new-software.js
126	110	views/user-edit-profile.js
127	111	views/create-institution.js
128		- views/complete-registration.js
129	112	views/search-software-catalog.js
130	113	views/profile-tabs-software.js
131	114	views/new-community.js
...	...	@@ -152,17 +135,6 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin
152	135	end
153	136	end
154	137
155		- def calc_percentage_registration(person)
156		- required_list = profile_required_list
157		- empty_fields = profile_required_empty_list person
158		- count = required_list[:person_fields].count +
159		- required_list[:user_fields].count
160		- percentege = 100 - ((empty_fields.count * 100) / count)
161		- person.percentage_incomplete = percentege
162		- person.save(validate: false)
163		- percentege
164		- end
165		-
166	138	def admin_panel_links
167	139	[
168	140	{
...	...	@@ -177,37 +149,6 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin
177	149
178	150	protected
179	151
180		- def profile_required_list
181		- fields = {}
182		- fields[:person_fields] = %w(cell_phone
183		- contact_phone
184		- comercial_phone
185		- country
186		- city
187		- state
188		- organization_website
189		- image
190		- identifier
191		- name)
192		-
193		- fields[:user_fields] = %w(secondary_email email)
194		- fields
195		- end
196		-
197		-
198		- def profile_required_empty_list(person)
199		- empty_fields = []
200		- required_list = profile_required_list
201		-
202		- required_list[:person_fields].each do \|field\|
203		- empty_fields << field.sub('_',' ') if person.send(field).blank?
204		- end
205		- required_list[:user_fields].each do \|field\|
206		- empty_fields << field.sub('_',' ') if person.user.send(field).blank?
207		- end
208		- empty_fields
209		- end
210		-
211	152	def user_transaction
212	153	user_editor_institution_actions
213	154
...	...
...	...	@@ -7,7 +7,6 @@
7	7	'NewSoftware',
8	8	'UserEditProfile',
9	9	'CreateInstitution',
10		- 'CompleteRegistration',
11	10	'SearchSoftwareCatalog',
12	11	'SoftwareDownload',
13	12	'ProfileTabsSoftware',
...	...
...	...	@@ -38,27 +38,6 @@
38	38	width: 180px;
39	39	}
40	40
41		-#complete_registration {
42		- padding: 5px;
43		- width: 100%;
44		- background-color: #fff;
45		-}
46		-
47		-#complete_registration a {
48		- text-decoration: none;
49		-}
50		-
51		-#complete_registration a:hover {
52		- font-weight: bold;
53		-}
54		-
55		-#complete_registration_percentage {
56		- width: 100%;
57		- height: 20px;
58		- background: #fff;
59		- border: solid 1px #000;
60		-}
61		-
62	41	#profile-data .invalid {
63	42	border-color: rgb(127, 0, 0);
64	43	box-shadow: 0px 0px 7px red;
...	...
...	...	@@ -1,60 +0,0 @@
1		-modulejs.define('CompleteRegistration', ['jquery', 'NoosferoRoot'], function($, NoosferoRoot) {
2		- 'use strict';
3		-
4		-
5		- var AJAX_URL = {
6		- hide_registration_incomplete_percentage:
7		- NoosferoRoot.urlWithSubDirectory("/plugin/software_communities/hide_registration_incomplete_percentage")
8		- };
9		-
10		-
11		- function hide_incomplete_percentage(evt) {
12		- evt.preventDefault();
13		-
14		- jQuery.get(AJAX_URL.hide_registration_incomplete_percentage, {hide:true}, function(response){
15		- if( response === true ) {
16		- jQuery("#complete_registration").fadeOut();
17		- }
18		- });
19		- }
20		-
21		-
22		- function show_complete_progressbar() {
23		- var percentage = jQuery("#complete_registration_message span").html();
24		- var canvas_tag = document.getElementById("complete_registration_percentage");
25		-
26		- if( canvas_tag !== null ) {
27		- var context = canvas_tag.getContext("2d");
28		-
29		- percentage = canvas_tag.width*(percentage/100.0);
30		-
31		- context.beginPath();
32		- context.rect(0, 0, percentage, canvas_tag.height);
33		- context.fillStyle = '#00FF00';
34		- context.fill();
35		- }
36		- }
37		-
38		-
39		- function repositioning_bar_percentage() {
40		- var complete_message = $("#complete_registration").remove();
41		-
42		- $(".profile-info-options").before(complete_message);
43		- }
44		-
45		-
46		- return {
47		- isCurrentPage: function() {
48		- return $("#complete_registration").length === 1;
49		- },
50		-
51		-
52		- init: function() {
53		- repositioning_bar_percentage();
54		-
55		- jQuery(".hide-incomplete-percentage").click(hide_incomplete_percentage);
56		-
57		- show_complete_progressbar();
58		- }
59		- }
60		-});
61	0	\ No newline at end of file
...	...	@@ -46,13 +46,12 @@ module PluginTestHelper
46	46	community
47	47	end
48	48
49		- def create_person name, email, password, password_confirmation, secondary_email, state, city
	49	+ def create_person name, email, password, password_confirmation, state, city
50	50	user = create_user(
51	51	name.to_slug,
52	52	email,
53	53	password,
54	54	password_confirmation,
55		- secondary_email
56	55	)
57	56	person = Person::new
58	57
...	...	@@ -70,14 +69,13 @@ module PluginTestHelper
70	69	person
71	70	end
72	71
73		- def create_user login, email, password, password_confirmation, secondary_email
	72	+ def create_user login, email, password, password_confirmation
74	73	user = User.new
75	74
76	75	user.login = login
77	76	user.email = email
78	77	user.password = password
79	78	user.password_confirmation = password_confirmation
80		- user.secondary_email = secondary_email
81	79
82	80	user
83	81	end
...	...
...	...	@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
5	5	class CommunitiesBlockTest < ActiveSupport::TestCase
6	6	include PluginTestHelper
7	7	def setup
8		- @person = create_person("My Name", "user@email.com", "123456", "123456", "user@secondary_email.com", "Any State", "Some City")
	8	+ @person = create_person("My Name", "user@email.com", "123456", "123456", "Any State", "Some City")
9	9
10	10	@gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
11	11	@gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
...	...