diff --git a/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb b/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb index 991f36f..504fa76 100644 --- a/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb +++ b/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb @@ -114,7 +114,7 @@ class GovUserPluginController < ApplicationController params[:community] ||= {} params[:institutions] ||= {} - @show_sisp_field = user.is_admin? + @show_admin_fields = user.is_admin? @governmental_sphere = get_governmental_spheres() @governmental_power = get_governmental_powers() @juridical_nature = get_juridical_natures() diff --git a/src/noosfero-spb/gov_user/controllers/gov_user_plugin_myprofile_controller.rb b/src/noosfero-spb/gov_user/controllers/gov_user_plugin_myprofile_controller.rb index 84bd92b..9fab36c 100644 --- a/src/noosfero-spb/gov_user/controllers/gov_user_plugin_myprofile_controller.rb +++ b/src/noosfero-spb/gov_user/controllers/gov_user_plugin_myprofile_controller.rb @@ -7,7 +7,7 @@ class GovUserPluginMyprofileController < MyProfileController end def edit_institution - @show_sisp_field = user.is_admin? + @show_admin_fields = user.is_admin? @state_list = NationalRegion.find( :all, :conditions => { :national_region_type_id => 2 }, diff --git a/src/noosfero-spb/gov_user/db/migrate/20160525181858_change_siorg_column_type.rb b/src/noosfero-spb/gov_user/db/migrate/20160525181858_change_siorg_column_type.rb new file mode 100644 index 0000000..fdbd0ab --- /dev/null +++ b/src/noosfero-spb/gov_user/db/migrate/20160525181858_change_siorg_column_type.rb @@ -0,0 +1,9 @@ +class ChangeSiorgColumnType < ActiveRecord::Migration + def self.up + change_column :institutions, :siorg_code, :string + end + + def self.down + change_column :institutions, :siorg_code, :integer + end +end diff --git a/src/noosfero-spb/gov_user/lib/institution.rb b/src/noosfero-spb/gov_user/lib/institution.rb index 70ea0e1..999e7f8 100644 --- a/src/noosfero-spb/gov_user/lib/institution.rb +++ b/src/noosfero-spb/gov_user/lib/institution.rb @@ -46,8 +46,18 @@ class Institution < ActiveRecord::Base } validate :validate_country, :validate_state, :validate_city, - :verify_institution_type + :verify_institution_type, :verify_siorg_code + def verify_siorg_code + if (self.siorg_code =~ /^[0-9]+$/).nil? + self.errors.add( + :siorg_code, + _("invalid, only numbers are allowed.") + ) + return false + end + true + end def has_accepted_rating? user_rating rating_ids = OrganizationRating.where(institution_id: self.id, organization_id: user_rating.organization_id).map(&:id) diff --git a/src/noosfero-spb/gov_user/po/gov_user.pot b/src/noosfero-spb/gov_user/po/gov_user.pot index 82900b9..fe9ba86 100644 --- a/src/noosfero-spb/gov_user/po/gov_user.pot +++ b/src/noosfero-spb/gov_user/po/gov_user.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 11:46-0300\n" -"PO-Revision-Date: 2016-05-30 11:46-0300\n" +"POT-Creation-Date: 2016-05-30 14:37-0300\n" +"PO-Revision-Date: 2016-05-30 14:37-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -84,15 +84,19 @@ msgstr "" msgid "institution" msgstr "" -#: ../lib/institution.rb:68 +#: ../lib/institution.rb:55 +msgid "invalid, only numbers are allowed." +msgstr "" + +#: ../lib/institution.rb:78 msgid "invalid, only public and private institutions are allowed." msgstr "" -#: ../lib/institution.rb:80 ../lib/institution.rb:91 ../lib/institution.rb:107 +#: ../lib/institution.rb:90 ../lib/institution.rb:101 ../lib/institution.rb:117 msgid "can't be blank" msgstr "" -#: ../lib/institution.rb:94 +#: ../lib/institution.rb:104 msgid "invalid state" msgstr "" @@ -155,105 +159,109 @@ msgstr "" msgid "Private Institution" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:48 +#: ../views/gov_user_plugin/_institution.html.erb:46 #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:45 msgid "Corporate Name" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:53 +#: ../views/gov_user_plugin/_institution.html.erb:51 msgid "Institution name already exists" msgstr "" +#: ../views/gov_user_plugin/_institution.html.erb:56 +#: ../views/gov_user_plugin/_institution.html.erb:58 +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:75 +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:77 +msgid "Acronym" +msgstr "" + #: ../views/gov_user_plugin/_institution.html.erb:57 -#: ../views/gov_user_plugin/_institution.html.erb:105 +#: ../views/gov_user_plugin/_institution.html.erb:67 #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:48 #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:76 msgid "Fantasy name" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:65 +#: ../views/gov_user_plugin/_institution.html.erb:76 #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:54 msgid "Country" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:69 +#: ../views/gov_user_plugin/_institution.html.erb:80 #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:54 msgid "Select a country" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:74 +#: ../views/gov_user_plugin/_institution.html.erb:85 #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:58 msgid "State" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:78 +#: ../views/gov_user_plugin/_institution.html.erb:89 #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:58 msgid "Select a state" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:83 +#: ../views/gov_user_plugin/_institution.html.erb:94 msgid "City" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:95 +#: ../views/gov_user_plugin/_institution.html.erb:106 #: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:68 msgid "CNPJ" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:104 -#: ../views/gov_user_plugin/_institution.html.erb:106 -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:75 -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:77 -msgid "Acronym" -msgstr "" - -#: ../views/gov_user_plugin/_institution.html.erb:114 +#: ../views/gov_user_plugin/_institution.html.erb:117 msgid "Governmental Sphere" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:125 +#: ../views/gov_user_plugin/_institution.html.erb:128 msgid "Governmental Power" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:136 +#: ../views/gov_user_plugin/_institution.html.erb:139 msgid "Juridical Nature" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:150 -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:121 +#: ../views/gov_user_plugin/_institution.html.erb:153 +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:132 msgid "SISP?" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:155 -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:126 +#: ../views/gov_user_plugin/_institution.html.erb:158 +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:137 #: ../views/profile/_institution_tab.html.erb:19 msgid "Yes" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:160 -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:130 -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:133 +#: ../views/gov_user_plugin/_institution.html.erb:163 +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:141 +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:144 #: ../views/profile/_institution_tab.html.erb:19 msgid "No" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:170 -#: ../views/gov_user_plugin/_institution.html.erb:173 -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:143 +#: ../views/gov_user_plugin/_institution.html.erb:171 +msgid "SIORG Code" +msgstr "" + +#: ../views/gov_user_plugin/_institution.html.erb:180 +#: ../views/gov_user_plugin/_institution.html.erb:183 +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:154 msgid "Save" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:171 -#: ../views/gov_user_plugin/_institution.html.erb:174 -#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:144 +#: ../views/gov_user_plugin/_institution.html.erb:181 +#: ../views/gov_user_plugin/_institution.html.erb:184 +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:155 msgid "Cancel" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:175 +#: ../views/gov_user_plugin/_institution.html.erb:185 msgid "Could not send the form data to the server" msgstr "" -#: ../views/gov_user_plugin/_institution.html.erb:183 +#: ../views/gov_user_plugin/_institution.html.erb:193 msgid "Creating institution" msgstr "" @@ -283,6 +291,10 @@ msgstr "" msgid "Juridical Nature:" msgstr "" +#: ../views/gov_user_plugin_myprofile/edit_institution.html.erb:119 +msgid "SIORG Code:" +msgstr "" + #: ../views/incomplete_registration.html.erb:3 msgid "Complete Profile" msgstr "" diff --git a/src/noosfero-spb/gov_user/po/pt/gov_user.po b/src/noosfero-spb/gov_user/po/pt/gov_user.po index 8dff18f..0d400f3 100644 --- a/src/noosfero-spb/gov_user/po/pt/gov_user.po +++ b/src/noosfero-spb/gov_user/po/pt/gov_user.po @@ -60,6 +60,9 @@ msgstr "Instituição" msgid "institution" msgstr "instituição" +msgid "invalid, only numbers are allowed." +msgstr "inválido, apenas números são permitidos." + msgid "invalid, only public and private institutions are allowed." msgstr "Inválido, somente instituições públicas e privadas são permitidas." @@ -120,6 +123,9 @@ msgstr "Razão Social" msgid "Institution name already exists" msgstr "Nome de Instituição já existe" +msgid "Acronym" +msgstr "Sigla" + msgid "Fantasy name" msgstr "Nome Fantasia" @@ -141,9 +147,6 @@ msgstr "Cidade" msgid "CNPJ" msgstr "CNPJ" -msgid "Acronym" -msgstr "Sigla" - msgid "Governmental Sphere" msgstr "Esfera Governamental:" @@ -162,6 +165,9 @@ msgstr "Sim" msgid "No" msgstr "Não" +msgid "SIORG Code" +msgstr "Código SIORG" + msgid "Save" msgstr "Salvar" @@ -195,6 +201,9 @@ msgstr "Poder Governamental:" msgid "Juridical Nature:" msgstr "Natureza Jurídica:" +msgid "SIORG Code:" +msgstr "Código SIORG:" + msgid "Complete Profile" msgstr "Complete o Perfil" diff --git a/src/noosfero-spb/gov_user/public/views/create-institution.js b/src/noosfero-spb/gov_user/public/views/create-institution.js index 1f69db3..02a999a 100644 --- a/src/noosfero-spb/gov_user/public/views/create-institution.js +++ b/src/noosfero-spb/gov_user/public/views/create-institution.js @@ -45,6 +45,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] function get_institution_post_data() { + return { cnpj: $("#institutions_cnpj").val(), type: $("input[name='institutions[type]']:checked").val(), @@ -52,7 +53,9 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] governmental_power: $("#institutions_governmental_power").selected().val(), governmental_sphere: $("#institutions_governmental_sphere").selected().val(), juridical_nature: $("#institutions_juridical_nature").selected().val(), - corporate_name: $("#institutions_corporate_name").val() + corporate_name: $("#institutions_corporate_name").val(), + siorg_code: $("#institutions_siorg_code").val(), + sisp: $('input[name="institutions[sisp]"]:checked').val() }; } diff --git a/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb b/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb index 6901a38..4d8f1ae 100644 --- a/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb +++ b/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb @@ -30,36 +30,47 @@ <%= hidden_field_tag "edit_institution_page", false %> <%= fields_for :institutions do |inst| %>
-
+
<%= labelled_radio_button _('Public Institution'), 'institutions[type]', 'PublicInstitution', true %>
-
+
<%= labelled_radio_button _('Private Institution'), 'institutions[type]', 'PrivateInstitution' %>
-
-
-
+
- <%= f.text_field(:name, :class => flash[:error_community_name], :value => params[:community][:name]) %> + <%= f.text_field(:name, :class => flash[:error_community_name], :maxlength => 250, :value => params[:community][:name]) %> <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %>
-
+
+
+ <%= hidden_field_tag "acronym_translate", _("Acronym") %> + <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %> + <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel", id: "institution_acronym_label") %> + <%= inst.text_field(:acronym, :value => params[:institutions][:acronym], :maxlength => 12) %> +
+
+ +
+ +
+
<%= inst.label "corporate_name", _("Fantasy name"), :class=>"formlabel" %> - <%= inst.text_field(:corporate_name, :value => params[:institutions][:corporate_name], :size => 55) %> + <%= inst.text_field(:corporate_name, :value => params[:institutions][:corporate_name], :size => 55, :maxlength => 250) %>
+
- <%= f.text_field(:city, :class => flash[:error_community_city], :value => params[:community][:city]) %> + <%= f.text_field(:city, :class => flash[:error_community_city], :value => params[:community][:city], :maxlength => 250) %>
@@ -99,14 +110,6 @@
-
-
- <%= hidden_field_tag "acronym_translate", _("Acronym") %> - <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %> - <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel") %> - <%= inst.text_field(:acronym, :value => params[:institutions][:acronym]) %> -
-
@@ -141,28 +144,35 @@
-
-
-
- <% if @show_sisp_field %> + <% if @show_admin_fields %> +
+
+
-
- <%= _("SISP?") %> -
+
+ <%= _("SISP?") %> +
-
- <%= inst.radio_button(:sisp, true, :class => "#{flash[:error_institution_sisp]}" ) %> - <%= inst.label :sisp ,_("Yes"), :value => true %> -
+
+ <%= inst.radio_button(:sisp, true, :class => "#{flash[:error_institution_sisp]}" ) %> + <%= inst.label :sisp ,_("Yes"), :value => true %> +
-
- <%= inst.radio_button(:sisp, false, :checked=>"checked", :class => "#{flash[:error_institution_sisp]}") %> - <%= inst.label :sisp ,_("No"), :value => false %> +
+ <%= inst.radio_button(:sisp, false, :checked=>"checked", :class => "#{flash[:error_institution_sisp]}") %> + <%= inst.label :sisp ,_("No"), :value => false %> +
- <% end %>
-
+ +
+
+ <%= inst.label("siorg_code" ,_("SIORG Code"), :class=>"formlabel") %> + <%= inst.text_field(:siorg_code, :value => params[:institutions][:siorg_code]) %> +
+
+ <% end %> +
+
+ +
+ <%= inst.label("siorg_code" ,_("SIORG Code:"), :class=>"formlabel") %> + <%= inst.text_field(:siorg_code, :value => @institution.siorg_code) %> +
+
+
+
+
@@ -120,7 +131,7 @@
<%= _("SISP?") %>
- <% if @show_sisp_field %> + <% if @show_admin_fields %>
<%= inst.radio_button(:sisp, true, :checked=>(@institution.sisp ? true : false)) %> <%= inst.label("sisp" ,_("Yes")) %> diff --git a/src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css b/src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css index 4965969..f483722 100644 --- a/src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css +++ b/src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css @@ -352,7 +352,7 @@ } .action-gov_user_plugin-create_institution_admin #community_name { - width: 200px; + width: 372px; } .action-gov_user_plugin_myprofile-edit_institution #institutions_corporate_name { @@ -360,8 +360,10 @@ color: black; } +.action-gov_user_plugin_myprofile-edit_institution #institutions_cnpj, +.action-gov_user_plugin-create_institution_admin #institutions_cnpj, .action-gov_user_plugin-create_institution_admin #institutions_corporate_name { - width: 310px; + width: 508px; } .action-gov_user_plugin_myprofile-edit_institution #community_country { @@ -388,15 +390,13 @@ } .action-gov_user_plugin-create_institution_admin #community_city { - width: 222px; + width: 199px; } -.action-gov_user_plugin_myprofile-edit_institution #institutions_cnpj, .action-gov_user_plugin_myprofile-edit_institution #institutions_acronym, -.action-gov_user_plugin-create_institution_admin #institutions_cnpj, .action-gov_user_plugin-create_institution_admin #institutions_acronym { text-indent: 5px; - width: 530px; + width: 111px; } .action-gov_user_plugin_myprofile-edit_institution .modal-form-actions, @@ -694,6 +694,13 @@ color: #585858; } +#noosfero_profile-content #content .main-content #profile-data #institutions_siorg_code, +.action-profile_editor-edit #content .main-content #profile-data #institutions_siorg_code, +.action-gov_user_plugin-create_institution_admin #content .main-content #institutions_siorg_code, +.action-organization_ratings_plugin_profile-new_rating #content .main-content #institutions_siorg_code { + width: 189px; +} + .action-users-send_mail #content .main-content{ font-family: Arial; } diff --git a/src/noosfero-spb/noosfero-spb-theme/css/modal.css b/src/noosfero-spb/noosfero-spb-theme/css/modal.css index 77ac0bd..72c2cdf 100644 --- a/src/noosfero-spb/noosfero-spb-theme/css/modal.css +++ b/src/noosfero-spb/noosfero-spb-theme/css/modal.css @@ -235,13 +235,15 @@ .action-profile_editor-edit #content .main-content #profile-data .modal #community_name, .modal #community_name { height: 16px; - width: 200px; + width: 392px; } +.action-profile_editor-edit #content .main-content #profile-data .modal #institutions_cnpj, .action-profile_editor-edit #content .main-content #profile-data .modal #institutions_corporate_name, +.modal #institutions_cnpj, .modal #institutions_corporate_name { height: 16px; - width: 285px; + width: 533px; } .action-profile_editor-edit #content .main-content #profile-data .modal #community_country, @@ -257,16 +259,14 @@ .action-profile_editor-edit #content .main-content #profile-data .modal #community_city, .modal #community_city { height: 16px; - width: 190px; + width: 205px; margin-top: 2px; } -.action-profile_editor-edit #content .main-content #profile-data .modal #institutions_cnpj, .action-profile_editor-edit #content .main-content #profile-data .modal #institutions_acronym, -.modal #institutions_cnpj, .modal #institutions_acronym { height: 16px; - width: 530px; + width: 111px; } .action-profile_editor-edit #content .main-content #profile-data .modal a.button.with-text.icon-add, -- libgit2 0.21.2