Moving position of fields on institution creation and add corporate_name

field Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Moving position of fields on institution creation and add corporate_name
field Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Gabriela Navarro
1 parent d2acf743
Showing 5 changed files with 51 additions and 26 deletions Show diff stats
db/migrate/20141103183013_add_corporate_name_to_institution.rb
lib/institution.rb
public/mpog-institution-validations.js
test/functional/mpog_software_plugin_controller_test.rb
views/mpog_software_plugin/_institution.html.erb
@@ -0,0 +1,9 @@
+class AddCorporateNameToInstitution < ActiveRecord::Migration
+  def up
+    add_column :institutions, :corporate_name, :string
+  end
+
+  def down
+    remove_column :institutions, :corporate_name
+  end
+end
@@ -8,10 +8,12 @@ class Institution &lt; ActiveRecord::Base
   attr_accessible :name, :acronym, :unit_code, :parent_code, :unit_type, 
                   :sub_juridical_nature, :normalization_level, 
                   :version, :cnpj, :type, :governmental_power, :governmental_sphere,
-                  :sisp, :juridical_nature
+                  :sisp, :juridical_nature, :corporate_name
   validates :name, :presence=>true, :uniqueness=>true
+  validates :corporate_name, :presence => true
+
   before_save :verify_institution_type
   belongs_to :community
@@ -46,7 +46,8 @@
           acronym : jQuery("#institutions_acronym").val(),
           governmental_power: jQuery("#institutions_governmental_power").selected().val(),
           governmental_sphere: jQuery("#institutions_governmental_sphere").selected().val(),
-          juridical_nature: jQuery("#institutions_juridical_nature").selected().val()
+          juridical_nature: jQuery("#institutions_juridical_nature").selected().val(),
+          corporate_name: jQuery("#institutions_corporate_name").val()
         },
     }
   }
@@ -164,7 +164,8 @@ class MpogSoftwarePluginControllerTest &lt; ActionController::TestCase
         :acronym => "",
         :governmental_power => "",
         :governmental_sphere => "",
-        :juridical_nature => ""
+        :juridical_nature => "",
+        :corporate_name => "coporate default"
       }
     }
     fields
@@ -186,6 +187,7 @@ class MpogSoftwarePluginControllerTest &lt; ActionController::TestCase
     institution.governmental_power = gov_p
     institution.governmental_sphere = gov_s
     institution.cnpj = cnpj
+    institution.corporate_name = "corporate default"
     institution.save!
     institution
   end
@@ -20,33 +20,45 @@
 <div id = 'create_institution_errors' class='errorExplanation hide-field'></div>
 <div>
+  <div class="fields-required">
+    <span class="errorExplanation"><%= _("All fields with (*) are mandatory") %></span>
+  </div>
+  <br/>
   <%= labelled_form_for :community, :url => {:action=>"new_institution"}, :html => { :multipart => true, :id=>"institution_form" } do |f| %>
-    <%= required f.text_field(:name) %>
-    <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %>
-
-    <%= required select_country(_('Country'), 'community', 'country', {:class => 'type-select', :id => "community_country"}) %>
-    <%= required f.text_field(:state) %>
-    <%= required f.text_field(:city) %>
     <%= fields_for :institutions do |inst| %>
+      <span class=''>
+          <div class='formfield type-radio'>
+            <label> <%= _("Public Institution") %>
+              <%= radio_button_tag("institutions[type]", "PublicInstitution", true) %>
+            </label>
+
+            <label>
+              <%= _("Private Institution") %>
+              <%= radio_button_tag("institutions[type]" ,"PrivateInstitution")%>
+            </label>
+          </div>
+        </span>
+
+      <%= required f.text_field(:name) %>
+      <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %>
       <span class='required-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") %>
+          <%= inst.label "corporate_name", _("Corporate Name"), :class=>"formlabel" %>
+          <%= required inst.text_field(:corporate_name) %>
         </div>
       </span>
-      <span class=''>
-        <div class='formfield type-radio'>
-          <label> <%= _("Public Institution") %>
-            <%= radio_button_tag("institutions[type]", "PublicInstitution", true) %>
-          </label>
-
-          <label>
-            <%= _("Private Institution") %>
-            <%= radio_button_tag("institutions[type]" ,"PrivateInstitution")%>
-          </label>
+      <%= required select_country(_('Country'), 'community', 'country', {:class => 'type-select', :id => "community_country"}) %>
+      <%= required f.text_field(:state) %>
+      <%= required f.text_field(:city) %>
+
+
+      <span class='required-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") %>
         </div>
       </span>
@@ -61,18 +73,17 @@
       <span class='required-field public-institutions-fields'>
         <div class="formfield type-text">
-          <%= inst.label("governmental_power_id" ,_("Governmental Power:"), :class=>"formlabel") %>
-          <%= inst.select(:governmental_power, [[_("Select a Governmental Power"), 0]]|GovernmentalPower.all.map {|g| [g.name, g.id]}, {:selected=>0})%>
+          <%= inst.label("governmental_sphere_id" ,_("Governmental Sphere:"), :class=>"formlabel") %>
+          <%= inst.select(:governmental_sphere, [[_("Select a Governmental Sphere"), 0]]|GovernmentalSphere.all.map {|s| [s.name, s.id]}, {:selected=>0})%>
         </div>
       </span>
       <span class='required-field public-institutions-fields'>
         <div class="formfield type-text">
-          <%= inst.label("governmental_sphere_id" ,_("Governmental Sphere:"), :class=>"formlabel") %>
-          <%= inst.select(:governmental_sphere, [[_("Select a Governmental Sphere"), 0]]|GovernmentalSphere.all.map {|s| [s.name, s.id]}, {:selected=>0})%>
+          <%= inst.label("governmental_power_id" ,_("Governmental Power:"), :class=>"formlabel") %>
+          <%= inst.select(:governmental_power, [[_("Select a Governmental Power"), 0]]|GovernmentalPower.all.map {|g| [g.name, g.id]}, {:selected=>0})%>
         </div>
       </span>
-
       <span class='required-field public-institutions-fields'>
         <div class="formfield type-text">
           <%= inst.label("juridical_nature_id" ,_("Juridical Nature:"), :class=>"formlabel") %>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class AddCorporateNameToInstitution < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :institutions, :corporate_name, :string
	4	+ end
	5	+
	6	+ def down
	7	+ remove_column :institutions, :corporate_name
	8	+ end
	9	+end