Download as
Browse Code »

Commit 1e974dda9cddde256d5d2f53769c87c23dd816a0

Authored by Luciano Prestes
Committed by Arthur Esposte
1 parent c09983e8
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

Add country, state, city in institution registration 

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 3 changed files with 13 additions and 2 deletions   Show diff stats
public/mpog-institution-validations.js
  Diff comments   View file @1e974dd
@@ -48,11 +48,15 @@ @@ -48,11 +48,15 @@
48 48
49 function get_post_data() { 49 function get_post_data() {
50 return { 50 return {
51 - community : { name : jQuery("#community_name").val()}, 51 + community : { name : jQuery("#community_name").val(),
  52 + country : jQuery("#community_country").val(),
  53 + state : jQuery("#community_state").val(),
  54 + city : jQuery("#community_city").val()
  55 + },
52 governmental : { 56 governmental : {
53 power : jQuery("#institutions_governmental_power").selected().val(), 57 power : jQuery("#institutions_governmental_power").selected().val(),
54 sphere : jQuery("#institutions_governmental_sphere").selected().val() 58 sphere : jQuery("#institutions_governmental_sphere").selected().val()
55 - } , 59 + },
56 institution : { 60 institution : {
57 cnpj: jQuery("#institutions_cnpj").val(), 61 cnpj: jQuery("#institutions_cnpj").val(),
58 type: get_selected_institution_type(), 62 type: get_selected_institution_type(),
views/mpog_software_plugin/create_institution.html.erb
  Diff comments   View file @1e974dd
@@ -24,6 +24,10 @@ @@ -24,6 +24,10 @@
24 <%= required f.text_field(:name) %> 24 <%= required f.text_field(:name) %>
25 <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %> 25 <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %>
26 26
  27 + <%= required select_country(_('Country'), f, 'country', {:class => 'type-select', :id => "community_country"}) %>
  28 + <%= required f.text_field(:state) %>
  29 + <%= required f.text_field(:city) %>
  30 +
27 <%= fields_for :institutions do |inst| %> 31 <%= fields_for :institutions do |inst| %>
28 32
29 <span class='required-field'> 33 <span class='required-field'>
views/profile/_institution_tab.html.erb
  Diff comments   View file @1e974dd
@@ -6,6 +6,9 @@ @@ -6,6 +6,9 @@
6 <%= display_field(_('Type:'), profile.institution, :type, true) %> 6 <%= display_field(_('Type:'), profile.institution, :type, true) %>
7 <%= display_field(_('CNPJ:'), profile.institution, :cnpj, true) %> 7 <%= display_field(_('CNPJ:'), profile.institution, :cnpj, true) %>
8 <%= display_field(_('Last modification:'), profile.institution, :date_modification, true) %> 8 <%= display_field(_('Last modification:'), profile.institution, :date_modification, true) %>
  9 + <%= display_field(_('Country:'), profile.institution.community, :country, true) %>
  10 + <%= display_field(_('State:'), profile.institution.community, :state, true) %>
  11 + <%= display_field(_('City:'), profile.institution.community, :city, true) %>
9 <% if profile.institution.type == "PrivateInstitution"%> 12 <% if profile.institution.type == "PrivateInstitution"%>
10 <%= display_field(_('Fantasy Name:'), profile.institution, :acronym, true) %> 13 <%= display_field(_('Fantasy Name:'), profile.institution, :acronym, true) %>
11 <% else %> 14 <% else %>