Fix some institution problems:

-Add the create institution option on admin panel -Fix some accentuation issues. Still needs to make the seed.rb file to populate the DB with the initial options -Add cancel button on the create institution form

Fix some institution problems:
-Add the create institution option on admin panel -Fix some accentuation issues. Still needs to make the seed.rb file to populate the DB with the initial options -Add cancel button on the create institution form
Gabriela Navarro · Fabio Teixeira
1 parent 0573a077
Showing 6 changed files with 33 additions and 11 deletions Show diff stats
lib/gov_user_plugin.rb
public/static/governmental_powers.txt
public/static/governmental_sphere.txt
public/static/juridical_nature.txt
public/views/create-institution.js
views/gov_user_plugin/_institution.html.erb
@@ -137,6 +137,18 @@ class GovUserPlugin &lt; Noosfero::Plugin
     )
   end
+  def admin_panel_links
+    [
+      {
+        :title => _('Create Institution'),
+        :url => {
+          :controller => 'gov_user_plugin',
+          :action => 'create_institution_admin'
+        }
+      }
+    ]
+  end
+
   protected
   def profile_required_list
 Executivo
 Legislativo
-Judiciario
-Nao se aplica
+Judiciário
+Não se aplica
 Federal
 Estadual
 Distrital
-Municipal
 \ No newline at end of file
+Municipal
-Administracao Direta
+Administração Direta
 Autarquia
-Empresa Publica
-Fundacao
-Orgao Autonomo
+Empresa Pública
+Fundação
+Orgão Autônomo
 Sociedade
 Sociedade Civil
 Sociedade de Economia Mista
@@ -125,6 +125,11 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     });
   }
+  function cancel_institution(evt){
+    evt.preventDefault();
+    $('#institution_dialog').dialog('close');
+  }
+
   function institution_already_exists(){
     if( this.value.length >= 3 ) {
@@ -187,8 +192,6 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function add_new_institution(evt) {
-    (" JAJAjAjAJAJaJ ADD NEW INST")
-
     evt.preventDefault();
     var selected = $("#institution_selected");
     var institution_already_added = $(".institutions_added li[data-institution='"+selected.val()+"']").length;
@@ -227,6 +230,8 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     var cnpj = $("#institutions_cnpj").parent().parent();
     var city = $("#community_city").parent().parent();
     var state = $("#community_state").parent().parent();
+    var inst_type = $("input[name='institutions[type]']:checked").val();
+    institution_type_actions(inst_type)
     if( country === "-1" ) $("#community_country").val("BR");
@@ -243,7 +248,8 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function institution_type_actions(type) {
-    if( type === "PublicInstitution" ) {
+    var country = $("#community_country").val();
+    if( type === "PublicInstitution" && country == "BR") {
       show_public_institutions_fields();
     } else {
       show_private_institutions_fields();
@@ -255,6 +261,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     var divisor_option = SelectElement.generateOption("-1", "--------------------------------");
     var default_option = SelectElement.generateOption("BR", "Brazil");
+
     var inst_type = $("input[name='institutions[type]']:checked").val();
     var country = $("#community_country").val();
@@ -282,6 +289,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     });
     $('#save_institution_button').click(save_institution);
+    $('#cancel_institution_button').click(cancel_institution);
     $("#community_name").keyup(institution_already_exists);
@@ -64,7 +64,7 @@
       <span class='required-field'>
         <div class="formfield">
           <label for="community_state" class="formlabel"><%= _("State") %></label>
-          <%= f.select(:state, @state_list.collect {|state| [state.name, state.name]}) %>
+          <%= f.select(:state, [[_('Select a state'), '-1']] | @state_list.collect {|state| [state.name, state.name]}) %>
         </div>
       </span>
@@ -115,9 +115,11 @@
       <% if @url_token == "create_institution_admin" %>
         <%= submit_button :save, _('Save') %>
+        <%= button(:cancel, _("Cancel"), {:controller => "admin_panel", :action => 'index'}) %>
       <%else%>
         <div>
          <%= link_to(_('Save'), '#', :id=>'save_institution_button', :class=>'button with-text icon-add') %>
+         <%= link_to(_('Cancel'), '#', :id=>"cancel_institution_button", :class=>'button with-text icon-cancel') %>
         </div>
         <%= hidden_field_tag :institution_error_message, _("Could not send the form data to the server") %>
       <%end%>
	@@ -137,6 +137,18 @@ class GovUserPlugin < Noosfero::Plugin		@@ -137,6 +137,18 @@ class GovUserPlugin < Noosfero::Plugin
137	)	137	)
138	end	138	end
139		139
		140	+ def admin_panel_links
		141	+ [
		142	+ {
		143	+ :title => _('Create Institution'),
		144	+ :url => {
		145	+ :controller => 'gov_user_plugin',
		146	+ :action => 'create_institution_admin'
		147	+ }
		148	+ }
		149	+ ]
		150	+ end
		151	+
140	protected	152	protected
141		153
142	def profile_required_list	154	def profile_required_list
1	Executivo	1	Executivo
2	Legislativo	2	Legislativo
3	-Judiciario
4	-Nao se aplica	3	+Judiciário
		4	+Não se aplica
1	Federal	1	Federal
2	Estadual	2	Estadual
3	Distrital	3	Distrital
4	-Municipal
5	\ No newline at end of file	4	\ No newline at end of file
		5	+Municipal