Álvaro Fernando Matos de Souza · Daniela Feitosa · Daniela Feitosa · Daniela Feitosa · Melissa Wen · Marcos Pereira
Showing 13 changed files Show diff stats
src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb
src/noosfero-spb/gov_user/controllers/gov_user_plugin_myprofile_controller.rb
src/noosfero-spb/gov_user/db/migrate/20160525181858_change_siorg_column_type.rb
src/noosfero-spb/gov_user/features/institution_registration.feature
src/noosfero-spb/gov_user/lib/institution.rb
src/noosfero-spb/gov_user/po/gov_user.pot
src/noosfero-spb/gov_user/po/pt/gov_user.po
src/noosfero-spb/gov_user/public/views/create-institution.js
src/noosfero-spb/gov_user/test/unit/institution_test.rb
src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb
src/noosfero-spb/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb
src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css
src/noosfero-spb/noosfero-spb-theme/css/modal.css
@@ -120,7 +120,7 @@ class GovUserPluginController &lt; 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()
@@ -7,7 +7,7 @@ class GovUserPluginMyprofileController &lt; 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 },
@@ -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
@@ -47,3 +47,25 @@ Feature: Institution Field
     And I should not see "community_city"
     And I select "Brazil" from "community_country"
     Then I should not see "Gama"
+
+  @selenium
+  Scenario: Show sisp and siorg field to admin on create new institution form
+    Given I follow "Control panel"
+    And I follow "Edit Profile"
+    When I follow "Create new institution"
+    And I choose "Public Institution"
+    Then I should see "SISP?"
+    And I should see "SIORG Code"
+
+  @selenium
+  Scenario: Not show sisp and siorg field to regular user on create new institution form
+    Given the following users
+    | login   |
+    | zombie  |
+    And I am logged in as "zombie"
+    When I follow "Control panel"
+    And I follow "Edit Profile"
+    And I follow "Create new institution"
+    And I choose "Public Institution"
+    Then I should not see "SISP?"
+    And I should not see "SIORG Code"
@@ -48,6 +48,9 @@ class Institution &lt; ActiveRecord::Base
   validate :validate_country, :validate_state, :validate_city,
            :verify_institution_type
+  validates :siorg_code,
+            format: {with: /\A[0-9]+\z/, message: _("invalid, only numbers are allowed.")},
+            allow_blank: true
   def has_accepted_rating? user_rating
     rating_ids = OrganizationRating.where(institution_id: self.id, organization_id: user_rating.organization_id).map(&:id)
@@ -89,15 +89,23 @@ msgstr &quot;&quot;
 msgid "Institution"
 msgstr ""
-#: ../lib/institution.rb:68
+#: ../lib/institution.rb:6
+msgid "institution"
+msgstr ""
+
+#: ../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 ""
@@ -160,105 +168,109 @@ msgstr &quot;&quot;
 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 ""
@@ -288,6 +300,10 @@ msgstr &quot;&quot;
 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 ""
@@ -63,6 +63,12 @@ msgstr &quot;Informações da Instituição&quot;
 msgid "Institution"
 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."
@@ -123,6 +129,9 @@ msgstr &quot;Razão Social&quot;
 msgid "Institution name already exists"
 msgstr "Nome de Instituição já existe"
+msgid "Acronym"
+msgstr "Sigla"
+
 msgid "Fantasy name"
 msgstr "Nome Fantasia"
@@ -144,9 +153,6 @@ msgstr &quot;Cidade&quot;
 msgid "CNPJ"
 msgstr "CNPJ"
-msgid "Acronym"
-msgstr "Sigla"
-
 msgid "Governmental Sphere"
 msgstr "Esfera Governamental:"
@@ -165,6 +171,9 @@ msgstr &quot;Sim&quot;
 msgid "No"
 msgstr "Não"
+msgid "SIORG Code"
+msgstr "Código SIORG"
+
 msgid "Save"
 msgstr "Salvar"
@@ -198,6 +207,9 @@ msgstr &quot;Poder Governamental:&quot;
 msgid "Juridical Nature:"
 msgstr "Natureza Jurídica:"
+msgid "SIORG Code:"
+msgstr "Código SIORG:"
+
 msgid "Complete Profile"
 msgstr "Complete o Perfil"
@@ -45,6 +45,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function get_institution_post_data() {
+
     return {
       cnpj: $("#institutions_cnpj").val(),
       type: $("input[name='institutions[type]']:checked").val(),
@@ -52,7 +53,9 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
       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()
     };
   }
@@ -73,4 +73,19 @@ class InstitutionTest &lt; ActiveSupport::TestCase
     assert_includes search_result_env1, @institution.id
     assert_not_includes search_result_env2, @institution.id
   end
+
+  should "not save if siorg_code is not a number" do
+    @institution.siorg_code = "not a number"
+    assert_equal false, @institution.save
+
+    @institution.siorg_code = "1111111"
+    assert_equal true, @institution.save
+  end
+
+  should "validate siorg_code if it is blank" do
+    @institution.siorg_code = ""
+    assert_equal true, @institution.save
+  end
+
+
 end
@@ -30,37 +30,48 @@
   <%= hidden_field_tag "edit_institution_page", false %>
   <%= fields_for :institutions do |inst| %>
     <div class="spb-row no-margin-top">
-      <div class='spb-col spb-col-3'>
+      <div class='spb-col'>
         <%= labelled_radio_button _('Public Institution'), 'institutions[type]', 'PublicInstitution', true %>
       </div>
-      <div class="spb-col spb-col-3">
+      <div class="spb-col">
         <%= labelled_radio_button _('Private Institution'), 'institutions[type]', 'PrivateInstitution' %>
       </div>
-      <div class="spb-col spb-col-3"></div>
-      <div class="spb-col spb-col-3"></div>
     </div>
     <div class="spb-row">
-      <div class="spb-col spb-col-5">
+      <div class="spb-col">
         <label for="community_name" class="formlabel">
           <%= _("Corporate Name") %><!-- razão social -->
           <span class="required-field">(*)</span>
         </label>
-        <%= 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" %>
       </div>
-      <div class="spb-col spb-col-6">
+    <div class="public-institutions-fields">
+      <div class="spb-col">
+        <%= 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) %>
+      </div>
+    </div>
+
+    </div>
+
+    <div class="spb-row">
+      <div class="spb-col spb-col-12">
         <%= inst.label "corporate_name", _("Fantasy name"), :class=>"formlabel" %><!-- Nome fantasia -->
-        <%= 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) %>
       </div>
     </div>
     <div class="spb-row">
-      <div class="spb-col spb-col-5">
+
+      <div class="spb-col">
         <label for="community_country" class="formlabel">
           <%= _("Country") %>
           <span class="required-field">(*)</span>
@@ -69,7 +80,7 @@
         <%= select("community", "country", [[_('Select a country'), -1]] + country_helper.countries, {:class => "type-select #{flash[:error_community_country]}"}) %>
       </div>
-      <div class="spb-col spb-col-2">
+      <div class="spb-col">
         <label for="community_state" class="formlabel">
           <%= _("State") %>
           <span class="required-field">(*)</span>
@@ -78,13 +89,13 @@
         <%= select("community", "state", [[_('Select a state'), '']] + @state_options,  {:class => "type-select #{flash[:error_community_state]}"}) %>
       </div>
-      <div class="spb-col spb-col-5">
+      <div class="spb-col">
         <label class="formlabel" for="community_city">
           <%= _("City") %>
           <span class="required-field">(*)</span>
         </label>
-        <%= 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) %>
       </div>
     </div>
@@ -99,14 +110,6 @@
       </div>
     </div>
-    <div class="spb-row">
-      <div class="spb-col spb-col-12">
-        <%= 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]) %>
-      </div>
-    </div>
     <div class="spb-row public-institutions-fields">
       <div class="spb-col spb-col-6">
@@ -141,28 +144,35 @@
       </div>
     </div>
-    <div class="spb-row public-institutions-fields">
-      <div class="spc-col spb-col-12 sisp-fields">
-        <div class="spb-col spb-col-3">
-          <% if @show_sisp_field %>
+    <% if @show_admin_fields %>
+      <div class="spb-row public-institutions-fields">
+        <div class="spc-col spb-col-12 sisp-fields">
+          <div class="spb-col spb-col-3">
-          <div class="spb-col spb-col-12">
-            <%= _("SISP?") %>
-          </div>
+            <div class="spb-col spb-col-12">
+              <%= _("SISP?") %>
+            </div>
-          <div class="spb-col spb-col-5">
-            <%= inst.radio_button(:sisp, true, :class => "#{flash[:error_institution_sisp]}" ) %>
-            <%= inst.label :sisp ,_("Yes"), :value => true %>
-          </div>
+            <div class="spb-col spb-col-5">
+              <%= inst.radio_button(:sisp, true, :class => "#{flash[:error_institution_sisp]}" ) %>
+              <%= inst.label :sisp ,_("Yes"), :value => true %>
+            </div>
-          <div class="spb-col spb-col-6">
-            <%= inst.radio_button(:sisp, false, :checked=>"checked", :class => "#{flash[:error_institution_sisp]}") %>
-            <%= inst.label :sisp ,_("No"), :value => false %>
+            <div class="spb-col spb-col-6">
+              <%= inst.radio_button(:sisp, false, :checked=>"checked", :class => "#{flash[:error_institution_sisp]}") %>
+              <%= inst.label :sisp ,_("No"), :value => false %>
+            </div>
           </div>
-          <% end %>
         </div>
       </div>
-    </div>
+
+      <div class="spb-row public-institutions-fields">
+        <div class="spb-col spb-col-12">
+          <%= inst.label("siorg_code" ,_("SIORG Code"), :class=>"formlabel") %>
+          <%= inst.text_field(:siorg_code, :value => params[:institutions][:siorg_code]) %>
+        </div>
+      </div>
+    <% end %>
     <div class="spb-row modal-form-actions">
       <div class="spb-col spb-col-6">
@@ -41,10 +41,21 @@
       </div>
       <div class="spb-row">
-        <div class="spb-col spb-col-4">
+        <div class="spb-col spb-col-7">
           <%= required labelled_form_field(_('Corporate Name'), text_field_tag('community[name]', @institution.community.name)) %>
         </div>
-        <div class="spb-col spb-col-5">
+        <span class='optional-field'>
+          <div class="spb-col spb-col-5">
+            <%= 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 => @institution.acronym) %>
+          </div>
+        </div>
+      </div>
+
+      <div class="spb-row">
+        <div class="spb-col spb-col-12">
           <%= labelled_form_field(_('Fantasy name'), inst.text_field(:corporate_name, :value => @institution.corporate_name)) %>
         </div>
       </div>
@@ -63,21 +74,16 @@
         </div>
       </div>
-      <span class='optional-field'>
-        <div class="formfield type-text">
-          <%= inst.label("cnpj" ,_("CNPJ"), :class=>"formlabel") %>
-          <%= required inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => @institution.cnpj) %>
-        </div>
-      </span>
-
-      <span class='optional-field'>
-        <div class="formfield type-text">
-          <%= 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 => @institution.acronym) %>
+      <div class="spb-row">
+        <div class="spb-col spb-col-12">
+          <span class='optional-field'>
+            <div class="formfield type-text">
+              <%= inst.label("cnpj" ,_("CNPJ"), :class=>"formlabel") %>
+              <%= required inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => @institution.cnpj) %>
+            </div>
+          </span>
         </div>
-      </span>
+      </div>
       <div class="spb-row public-institutions-fields">
         <div class="spb-col spb-col-6">
@@ -112,6 +118,17 @@
         </div>
       </div>
+      <div class="spb-row public-institutions-fields">
+        <div class="spb-col spb-col-6">
+          <span class='required-field public-institutions-fields'>
+            <div class="formfield type-text">
+              <%= inst.label("siorg_code" ,_("SIORG Code:"), :class=>"formlabel") %>
+              <%= inst.text_field(:siorg_code, :value => @institution.siorg_code) %>
+            </div>
+          </span>
+        </div>
+      </div>
+
       <div class="spc-col spb-col-12 sisp-fields">
         <div class="spb-row public-institutions-fields">
           <div class="spb-col spb-col-3">
@@ -120,7 +137,7 @@
                 <div class="spb-col spb-col-12">
                   <%= _("SISP?") %>
                 </div>
-                <% if @show_sisp_field %>
+                <% if @show_admin_fields %>
                   <div class="spb-col spb-col-4">
                     <%= inst.radio_button(:sisp, true, :checked=>(@institution.sisp ? true : false)) %>
                     <%= inst.label("sisp" ,_("Yes")) %>
@@ -346,22 +346,33 @@
   margin-bottom: 10px;
 }
+.action-gov_user_plugin_myprofile-edit_institution #content .main-content .formfieldline {
+  margin-top: 0;
+  padding: 0;
+}
+
 .action-gov_user_plugin_myprofile-edit_institution #community_name {
   color: black;
-  width: 220px
+  width: 402px;
 }
 .action-gov_user_plugin-create_institution_admin #community_name {
-  width: 200px;
+  width: 372px;
 }
 .action-gov_user_plugin_myprofile-edit_institution #institutions_corporate_name {
-  width: 287px;
+  width: 537px;
   color: black;
 }
+.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 #institutions_cnpj {
+  width: 537px;
+  color: black;
 }
 .action-gov_user_plugin_myprofile-edit_institution #community_country {
@@ -383,20 +394,18 @@
 }
 .action-gov_user_plugin_myprofile-edit_institution #community_city {
-  width: 165px;
+  width: 171px;
   color: black;
 }
 .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,
@@ -409,7 +418,20 @@
   margin-top: 15px;
 }
-.action-gov_user_plugin_myprofile-edit_institution #content form input.button.with-text,
+.action-gov_user_plugin_myprofile-edit_institution #content .main-content input.button.with-text.icon-save.submit {
+  background: #3E67B1 none;
+  color: #fff;
+  border-radius: 4px;
+  border: 1px solid #3E67B1;
+  font-size: 14px;
+  font-family: "open_sansregular", Arial;
+  line-height: 17px;
+  max-height: 32px;
+  height: 32px;
+  padding: 5px 15px;
+  margin-right: 5px;
+}
+
 .action-gov_user_plugin-create_institution_admin #content form input.button.with-text {
   background-color: #3E67B1;
   color: #fff;
@@ -694,6 +716,14 @@
   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-gov_user_plugin_myprofile-edit_institution #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;
 }
@@ -30,7 +30,7 @@
 .action-profile_editor-edit #content .main-content #profile-data .modal-dialog,
 .modal-dialog {
-  width: 45%;
+  width: 590px;
   margin: 15px auto;
   position: relative;
 }
@@ -235,13 +235,18 @@
 .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,
+.modal #institutions_cnpj{
+  height: 16px;
+  width: 115px;
+}
 .action-profile_editor-edit #content .main-content #profile-data .modal #institutions_corporate_name,
 .modal #institutions_corporate_name {
   height: 16px;
-  width: 285px;
+  width: 533px;
 }
 .action-profile_editor-edit #content .main-content #profile-data .modal #community_country,
@@ -251,22 +256,20 @@
 .action-profile_editor-edit #content .main-content #profile-data .modal #community_state,
 .modal #community_state {
-  width: 80px;
+  width: 90px;
 }
 .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,
	@@ -120,7 +120,7 @@ class GovUserPluginController < ApplicationController		@@ -120,7 +120,7 @@ class GovUserPluginController < ApplicationController
120	params[:community] \|\|= {}	120	params[:community] \|\|= {}
121	params[:institutions] \|\|= {}	121	params[:institutions] \|\|= {}
122		122
123	- @show_sisp_field = user.is_admin?	123	+ @show_admin_fields = user.is_admin?
124	@governmental_sphere = get_governmental_spheres()	124	@governmental_sphere = get_governmental_spheres()
125	@governmental_power = get_governmental_powers()	125	@governmental_power = get_governmental_powers()
126	@juridical_nature = get_juridical_natures()	126	@juridical_nature = get_juridical_natures()
	@@ -7,7 +7,7 @@ class GovUserPluginMyprofileController < MyProfileController		@@ -7,7 +7,7 @@ class GovUserPluginMyprofileController < MyProfileController
7	end	7	end
8		8
9	def edit_institution	9	def edit_institution
10	- @show_sisp_field = user.is_admin?	10	+ @show_admin_fields = user.is_admin?
11	@state_list = NationalRegion.find(	11	@state_list = NationalRegion.find(
12	:all,	12	:all,
13	:conditions => { :national_region_type_id => 2 },	13	:conditions => { :national_region_type_id => 2 },
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class ChangeSiorgColumnType < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_column :institutions, :siorg_code, :string
	4	+ end
	5	+
	6	+ def self.down
	7	+ change_column :institutions, :siorg_code, :integer
	8	+ end
	9	+end
	@@ -47,3 +47,25 @@ Feature: Institution Field		@@ -47,3 +47,25 @@ Feature: Institution Field
47	And I should not see "community_city"	47	And I should not see "community_city"
48	And I select "Brazil" from "community_country"	48	And I select "Brazil" from "community_country"
49	Then I should not see "Gama"	49	Then I should not see "Gama"
		50	+
		51	+ @selenium
		52	+ Scenario: Show sisp and siorg field to admin on create new institution form
		53	+ Given I follow "Control panel"
		54	+ And I follow "Edit Profile"
		55	+ When I follow "Create new institution"
		56	+ And I choose "Public Institution"
		57	+ Then I should see "SISP?"
		58	+ And I should see "SIORG Code"
		59	+
		60	+ @selenium
		61	+ Scenario: Not show sisp and siorg field to regular user on create new institution form
		62	+ Given the following users
		63	+ \| login \|
		64	+ \| zombie \|
		65	+ And I am logged in as "zombie"
		66	+ When I follow "Control panel"
		67	+ And I follow "Edit Profile"
		68	+ And I follow "Create new institution"
		69	+ And I choose "Public Institution"
		70	+ Then I should not see "SISP?"
		71	+ And I should not see "SIORG Code"
	@@ -73,4 +73,19 @@ class InstitutionTest < ActiveSupport::TestCase		@@ -73,4 +73,19 @@ class InstitutionTest < ActiveSupport::TestCase
73	assert_includes search_result_env1, @institution.id	73	assert_includes search_result_env1, @institution.id
74	assert_not_includes search_result_env2, @institution.id	74	assert_not_includes search_result_env2, @institution.id
75	end	75	end
		76	+
		77	+ should "not save if siorg_code is not a number" do
		78	+ @institution.siorg_code = "not a number"
		79	+ assert_equal false, @institution.save
		80	+
		81	+ @institution.siorg_code = "1111111"
		82	+ assert_equal true, @institution.save
		83	+ end
		84	+
		85	+ should "validate siorg_code if it is blank" do
		86	+ @institution.siorg_code = ""
		87	+ assert_equal true, @institution.save
		88	+ end
		89	+
		90	+
76	end	91	end