correcoes_aderencia: Correct complete registration percentage

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>

correcoes_aderencia: Correct complete registration percentage
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Fabio Teixeira
1 parent e1df99fb
Showing 5 changed files with 62 additions and 52 deletions Show diff stats
lib/mpog_software_plugin.rb
public/mpog-incomplete-registration.js
test/unit/mpog_software_plugin_test.rb
test/unit/plugin_test_helper.rb
views/incomplete_registration.html.erb
@@ -268,7 +268,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   end
   def profile_required_list
-    required_list = ["cell_phone","contact_phone","institutions","comercial_phone","country","city","state","organization_website","image"]
+    ["cell_phone","contact_phone","comercial_phone","country","city","state","organization_website","image"]
   end
   def profile_required_empty_list person
-function hide_incomplete_percentage(evt) {
-  evt.preventDefault();
+(function() {
+  function hide_incomplete_percentage(evt) {
+    evt.preventDefault();
-  jQuery.get("/plugin/mpog_software/hide_registration_incomplete_percentage", {hide:true}, function(response){
-    if( response == true )
-      jQuery("#complete_registration").fadeOut();
-  });
-}
+    jQuery.get("/plugin/mpog_software/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");
+  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");
+    if( canvas_tag != null ) {
+      var context = canvas_tag.getContext("2d");
-    percentage = canvas_tag.width*(percentage/100.0);
+      percentage = canvas_tag.width*(percentage/100.0);
-    context.beginPath();
-    context.rect(0, 0, percentage, canvas_tag.height);
-    context.fillStyle = '#00FF00';
-    context.fill();
+      context.beginPath();
+      context.rect(0, 0, percentage, canvas_tag.height);
+      context.fillStyle = '#00FF00';
+      context.fill();
+    }
   }
-}
-jQuery(document).ready(function(){
-  jQuery(".hide-incomplete-percentage").click(hide_incomplete_percentage);
+  jQuery(document).ready(function(){
+    jQuery(".hide-incomplete-percentage").click(hide_incomplete_percentage);
-  show_complete_progressbar();
-});
+    show_complete_progressbar();
+  });
+})();
 \ No newline at end of file
@@ -6,13 +6,11 @@ class MpogSoftwarePluginTest &lt; ActiveSupport::TestCase
   def setup
     @plugin = MpogSoftwarePlugin.new
-    @user = create_user("login", "user@email.com", "123456", "123456", "user@secondary_email.com")
-    @person = @user.person
+    @person = create_person("My Name", "user@email.com", "123456", "123456", "user@secondary_email.com", "Any State", "Some City")
   end
   def teardown
-    @user.person.destroy
-    @user.destroy
+    @person.destroy
   end
@@ -21,16 +19,17 @@ class MpogSoftwarePluginTest &lt; ActiveSupport::TestCase
   end
   should 'calculate the percentege of person incomplete fields' do
-    @person.name = "Person Name"
     @person.cell_phone = "76888919"
+    @person.contact_phone = "987654321"
-    required_list = ["cell_phone","contact_phone","institution","comercial_phone","country","city","state","organization_website","image"]
+    assert_equal(50, @plugin.calc_percentage_registration(@person))
-    empty_fields = required_list.count - 1
-    test_percentege = 100 - ((empty_fields * 100) / required_list.count)
+    @person.comercial_phone = "11223344"
+    @person.country = "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
-    plugin_percentege = @plugin.calc_percentage_registration(@person)
-
-    assert_equal(test_percentege, plugin_percentege)
+    assert_equal(100, @plugin.calc_percentage_registration(@person))
 	end
 end
@@ -35,25 +35,32 @@ module PluginTestHelper
     community
   end
+  def create_person name, email, password, password_confirmation, secondary_email, state, city
+    user = create_user(name.to_slug, email, password, password_confirmation, secondary_email)
+    person = Person::new
+
+    person.name = name
+    person.state = state
+    person.city = city
+    person.user = user
+    person.save
+
+    person
+  end
+
+  private
+
   def create_user login, email, password, password_confirmation, secondary_email
     user = User.new
+
     user.login = login
     user.email = email
     user.password = password
     user.password_confirmation = password_confirmation
     user.secondary_email = secondary_email
+
     user.save
-    user.person.save
     user
   end
-  def create_person name, email, password, password_confirmation, secondary_email, state, city
-    user = create_user(name.downcase, email, password, password_confirmation, secondary_email)
-    user.person.name = name
-    user.person.state = state
-    user.person.city = city
-    user.person.save
-    user.person
-  end
-
 end
-<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>
-      <%= @profile_edit_link %> |
-      <%= link_to _("Hide"), "#", :class=>"hide-incomplete-percentage" %>
+<% if @percentege < 100 then %>
+  <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>
+        <%= @profile_edit_link %> |
+        <%= link_to _("Hide"), "#", :class=>"hide-incomplete-percentage" %>
+      </div>
     </div>
   </div>
-</div>
 \ No newline at end of file
+<% end %>
 \ No newline at end of file
	@@ -268,7 +268,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -268,7 +268,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin
268	end	268	end
269		269
270	def profile_required_list	270	def profile_required_list
271	- required_list = ["cell_phone","contact_phone","institutions","comercial_phone","country","city","state","organization_website","image"]	271	+ ["cell_phone","contact_phone","comercial_phone","country","city","state","organization_website","image"]
272	end	272	end
273		273
274	def profile_required_empty_list person	274	def profile_required_empty_list person