Add Brazil as first country in the institution's select

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

Add Brazil as first country in the institution's select
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Fabio Teixeira · Gabriela Navarro
1 parent d24e09be
Showing 4 changed files with 58 additions and 42 deletions Show diff stats
lib/mpog_software_plugin.rb
public/mpog-custom-libraries.js
public/mpog-institution-validations.js
public/mpog-user-validations.js
@@ -248,7 +248,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   end
   def js_files
-    ["mpog-software.js", "mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js", "jquery.maskedinput.min.js"]
+    ["mpog-custom-libraries.js", "mpog-software.js", "mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js", "jquery.maskedinput.min.js"]
   end
   def add_new_organization_buttons
@@ -0,0 +1,30 @@
+/*
+* "Class" for select and option html generation
+*/
+var SelectElement = (function() {
+  function SelectElement(name, id) {
+    this.select = document.createElement("select");
+  }
+
+  SelectElement.prototype.setAttr = function(attr, value) {
+    return this.select.setAttribute(attr, value);
+  };
+
+  SelectElement.prototype.addOption = function(option) {
+    return this.select.add(option);
+  };
+
+  SelectElement.prototype.getSelect = function() {
+    return this.select;
+  };
+
+  SelectElement.generateOption = function(value, text) {
+    var option;
+    option = document.createElement("option");
+    option.setAttribute("value", value);
+    option.text = text;
+    return option;
+  };
+
+  return SelectElement;
+})();
 \ No newline at end of file
@@ -181,11 +181,13 @@
     jQuery(".intitution_cnpj_field").mask("99.999.999/9999-99");
   }
-  function show_hide_cnpj_city() {
+  function show_hide_cnpj_city(e) {
     var cnpj = jQuery("#institutions_cnpj").parent().parent();
     var city = jQuery("#community_city").parent().parent();
     var state = jQuery("#community_state").parent().parent();
+    if( this.value == "-1" ) jQuery(this).val("BR");
+
     if( this.value != "BR" ) {
       cnpj.hide();
       city.hide();
@@ -195,21 +197,33 @@
       city.show();
       state.show();
     }
+
+    e.preventDefault();
   }
-  function set_events() {
-    show_private_institutions_fields();
+  function institution_type_actions() {
+    if( this.value == "PublicInstitution" )
+      show_public_institutions_fields();
+    else
+      show_private_institutions_fields();
+  }
+
+  function set_form_count_custom_data() {
+    var divisor_option = SelectElement.generateOption("-1", "--------------------------------");
+    var default_option = SelectElement.generateOption("BR", "Brazil");
+    jQuery('#community_country').find("option[value='']").remove();
+    jQuery('#community_country').prepend(divisor_option);
+    jQuery('#community_country').prepend(default_option);
     jQuery('#community_country').val("BR");
+  }
+
+  function set_events() {
+    show_private_institutions_fields();
     jQuery("#create_institution_link").click(open_create_institution_modal);
-    jQuery("input[type='radio']").click(function(){
-      if( this.value == "PublicInstitution" )
-        show_public_institutions_fields();
-      else
-        show_private_institutions_fields();
-    });
+    jQuery("input[type='radio']").click(institution_type_actions);
     jQuery('#save_institution_button').click(save_institution);
@@ -226,5 +240,8 @@
     institution_autocomplete();
   }
-  jQuery(document).ready(set_events);
+  jQuery(document).ready(function(){
+    set_form_count_custom_data();
+    set_events();
+  });
 })();
 (function(){
   /*
-  * "Class" for select and option html generation
-  */
-  var SelectElement = (function() {
-    function SelectElement(name, id) {
-      this.select = document.createElement("select");
-    }
-
-    SelectElement.prototype.setAttr = function(attr, value) {
-      return this.select.setAttribute(attr, value);
-    };
-
-    SelectElement.prototype.addOption = function(option) {
-      return this.select.add(option);
-    };
-
-    SelectElement.prototype.getSelect = function() {
-      return this.select;
-    };
-
-    SelectElement.generateOption = function(value, text) {
-      var option;
-      option = document.createElement("option");
-      option.setAttribute("value", value);
-      option.text = text;
-      return option;
-    };
-
-    return SelectElement;
-  })();
-
-  /*
   * "Class" that switch state field between input and select
   * If the Country if Brazil, set state to select field
   * else set it as a input field
	@@ -248,7 +248,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -248,7 +248,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin
248	end	248	end
249		249
250	def js_files	250	def js_files
251	- ["mpog-software.js", "mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js", "jquery.maskedinput.min.js"]	251	+ ["mpog-custom-libraries.js", "mpog-software.js", "mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js", "jquery.maskedinput.min.js"]
252	end	252	end
253		253
254	def add_new_organization_buttons	254	def add_new_organization_buttons
	@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
		1	+/*
		2	+* "Class" for select and option html generation
		3	+*/
		4	+var SelectElement = (function() {
		5	+ function SelectElement(name, id) {
		6	+ this.select = document.createElement("select");
		7	+ }
		8	+
		9	+ SelectElement.prototype.setAttr = function(attr, value) {
		10	+ return this.select.setAttribute(attr, value);
		11	+ };
		12	+
		13	+ SelectElement.prototype.addOption = function(option) {
		14	+ return this.select.add(option);
		15	+ };
		16	+
		17	+ SelectElement.prototype.getSelect = function() {
		18	+ return this.select;
		19	+ };
		20	+
		21	+ SelectElement.generateOption = function(value, text) {
		22	+ var option;
		23	+ option = document.createElement("option");
		24	+ option.setAttribute("value", value);
		25	+ option.text = text;
		26	+ return option;
		27	+ };
		28	+
		29	+ return SelectElement;
		30	+})();
0	\ No newline at end of file	31	\ No newline at end of file
1	(function(){	1	(function(){
2	/*	2	/*
3	- * "Class" for select and option html generation
4	- */
5	- var SelectElement = (function() {
6	- function SelectElement(name, id) {
7	- this.select = document.createElement("select");
8	- }
9	-
10	- SelectElement.prototype.setAttr = function(attr, value) {
11	- return this.select.setAttribute(attr, value);
12	- };
13	-
14	- SelectElement.prototype.addOption = function(option) {
15	- return this.select.add(option);
16	- };
17	-
18	- SelectElement.prototype.getSelect = function() {
19	- return this.select;
20	- };
21	-
22	- SelectElement.generateOption = function(value, text) {
23	- var option;
24	- option = document.createElement("option");
25	- option.setAttribute("value", value);
26	- option.text = text;
27	- return option;
28	- };
29	-
30	- return SelectElement;
31	- })();
32	-
33	- /*
34	* "Class" that switch state field between input and select	3	* "Class" that switch state field between input and select
35	* If the Country if Brazil, set state to select field	4	* If the Country if Brazil, set state to select field
36	* else set it as a input field	5	* else set it as a input field