Download as
Browse Code »

Commit fca6ac8b5d698fda6e4232993c285cd771814eb4

Authored by Fabio Teixeira
1 parent e1df99fb
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

correcoes_aderencia: Correct complete registration percentage 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 5 changed files with 62 additions and 52 deletions   Show diff stats
lib/mpog_software_plugin.rb
  Diff comments   View file @fca6ac8
... ... @@ -268,7 +268,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
268 268 end
269 269  
270 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 272 end
273 273  
274 274 def profile_required_empty_list person
... ...
public/mpog-incomplete-registration.js
  Diff comments   View file @fca6ac8
1   -function hide_incomplete_percentage(evt) {
2   - evt.preventDefault();
  1 +(function() {
  2 + function hide_incomplete_percentage(evt) {
  3 + evt.preventDefault();
3 4  
4   - jQuery.get("/plugin/mpog_software/hide_registration_incomplete_percentage", {hide:true}, function(response){
5   - if( response == true )
6   - jQuery("#complete_registration").fadeOut();
7   - });
8   -}
  5 + jQuery.get("/plugin/mpog_software/hide_registration_incomplete_percentage", {hide:true}, function(response){
  6 + if( response == true )
  7 + jQuery("#complete_registration").fadeOut();
  8 + });
  9 + }
9 10  
10   -function show_complete_progressbar() {
11   - var percentage = jQuery("#complete_registration_message span").html();
12   - var canvas_tag = document.getElementById("complete_registration_percentage");
  11 + function show_complete_progressbar() {
  12 + var percentage = jQuery("#complete_registration_message span").html();
  13 + var canvas_tag = document.getElementById("complete_registration_percentage");
13 14  
14   - if( canvas_tag != null ) {
15   - var context = canvas_tag.getContext("2d");
  15 + if( canvas_tag != null ) {
  16 + var context = canvas_tag.getContext("2d");
16 17  
17   - percentage = canvas_tag.width*(percentage/100.0);
  18 + percentage = canvas_tag.width*(percentage/100.0);
18 19  
19   - context.beginPath();
20   - context.rect(0, 0, percentage, canvas_tag.height);
21   - context.fillStyle = '#00FF00';
22   - context.fill();
  20 + context.beginPath();
  21 + context.rect(0, 0, percentage, canvas_tag.height);
  22 + context.fillStyle = '#00FF00';
  23 + context.fill();
  24 + }
23 25 }
24   -}
25 26  
26   -jQuery(document).ready(function(){
27   - jQuery(".hide-incomplete-percentage").click(hide_incomplete_percentage);
  27 + jQuery(document).ready(function(){
  28 + jQuery(".hide-incomplete-percentage").click(hide_incomplete_percentage);
28 29  
29   - show_complete_progressbar();
30   -});
  30 + show_complete_progressbar();
  31 + });
  32 +})();
31 33 \ No newline at end of file
... ...
test/unit/mpog_software_plugin_test.rb
  Diff comments   View file @fca6ac8
... ... @@ -6,13 +6,11 @@ class MpogSoftwarePluginTest &lt; ActiveSupport::TestCase
6 6  
7 7 def setup
8 8 @plugin = MpogSoftwarePlugin.new
9   - @user = create_user("login", "user@email.com", "123456", "123456", "user@secondary_email.com")
10   - @person = @user.person
  9 + @person = create_person("My Name", "user@email.com", "123456", "123456", "user@secondary_email.com", "Any State", "Some City")
11 10 end
12 11  
13 12 def teardown
14   - @user.person.destroy
15   - @user.destroy
  13 + @person.destroy
16 14 end
17 15  
18 16  
... ... @@ -21,16 +19,17 @@ class MpogSoftwarePluginTest &lt; ActiveSupport::TestCase
21 19 end
22 20  
23 21 should 'calculate the percentege of person incomplete fields' do
24   - @person.name = "Person Name"
25 22 @person.cell_phone = "76888919"
  23 + @person.contact_phone = "987654321"
26 24  
27   - required_list = ["cell_phone","contact_phone","institution","comercial_phone","country","city","state","organization_website","image"]
  25 + assert_equal(50, @plugin.calc_percentage_registration(@person))
28 26  
29   - empty_fields = required_list.count - 1
30   - test_percentege = 100 - ((empty_fields * 100) / required_list.count)
  27 + @person.comercial_phone = "11223344"
  28 + @person.country = "I dont know"
  29 + @person.organization_website = "www.whatever.com"
  30 + @person.image = Image::new :uploaded_data=>fixture_file_upload('/files/rails.png', 'image/png')
  31 + @person.save
31 32  
32   - plugin_percentege = @plugin.calc_percentage_registration(@person)
33   -
34   - assert_equal(test_percentege, plugin_percentege)
  33 + assert_equal(100, @plugin.calc_percentage_registration(@person))
35 34 end
36 35 end
... ...
test/unit/plugin_test_helper.rb
  Diff comments   View file @fca6ac8
... ... @@ -35,25 +35,32 @@ module PluginTestHelper
35 35 community
36 36 end
37 37  
  38 + def create_person name, email, password, password_confirmation, secondary_email, state, city
  39 + user = create_user(name.to_slug, email, password, password_confirmation, secondary_email)
  40 + person = Person::new
  41 +
  42 + person.name = name
  43 + person.state = state
  44 + person.city = city
  45 + person.user = user
  46 + person.save
  47 +
  48 + person
  49 + end
  50 +
  51 + private
  52 +
38 53 def create_user login, email, password, password_confirmation, secondary_email
39 54 user = User.new
  55 +
40 56 user.login = login
41 57 user.email = email
42 58 user.password = password
43 59 user.password_confirmation = password_confirmation
44 60 user.secondary_email = secondary_email
  61 +
45 62 user.save
46   - user.person.save
47 63 user
48 64 end
49 65  
50   - def create_person name, email, password, password_confirmation, secondary_email, state, city
51   - user = create_user(name.downcase, email, password, password_confirmation, secondary_email)
52   - user.person.name = name
53   - user.person.state = state
54   - user.person.city = city
55   - user.person.save
56   - user.person
57   - end
58   -
59 66 end
... ...
views/incomplete_registration.html.erb
  Diff comments   View file @fca6ac8
1   -<div id='complete_registration'>
2   - <div id="complete_registration_message">
3   - <div><%= _("Complete Profile")+": <span>#{@percentege}</span>%" %></div>
4   - <canvas id="complete_registration_percentage" width="100%" height="20"></canvas>
5   - <div>
6   - <%= @profile_edit_link %> |
7   - <%= link_to _("Hide"), "#", :class=>"hide-incomplete-percentage" %>
  1 +<% if @percentege < 100 then %>
  2 + <div id='complete_registration'>
  3 + <div id="complete_registration_message">
  4 + <div><%= _("Complete Profile")+": <span>#{@percentege}</span>%" %></div>
  5 + <canvas id="complete_registration_percentage" width="100%" height="20"></canvas>
  6 + <div>
  7 + <%= @profile_edit_link %> |
  8 + <%= link_to _("Hide"), "#", :class=>"hide-incomplete-percentage" %>
  9 + </div>
8 10 </div>
9 11 </div>
10   -</div>
11 12 \ No newline at end of file
  13 +<% end %>
12 14 \ No newline at end of file
... ...