Merge branch 'modal_fine_tune' into 'master'

Modal fine tune Squashed branch, it adds: * Some fine tunes on institution modal styles * Fix public and private modal cnpj validations(with its tests) * Remove unnecessary code See merge request !95

Merge branch 'modal_fine_tune' into 'master'
Modal fine tune Squashed branch, it adds: * Some fine tunes on institution modal styles * Fix public and private modal cnpj validations(with its tests) * Remove unnecessary code See merge request !95
Thiago Ribeiro
2 parents 979d6052 f1cad301
Showing 12 changed files with 74 additions and 97 deletions Show diff stats
src/noosfero-spb/gov_user/lib/gov_user_plugin.rb
src/noosfero-spb/gov_user/lib/institution.rb
src/noosfero-spb/gov_user/lib/private_institution.rb
src/noosfero-spb/gov_user/lib/public_institution.rb
src/noosfero-spb/gov_user/po/pt/gov_user.po
src/noosfero-spb/gov_user/public/lib/modal-observer.js
src/noosfero-spb/gov_user/public/views/create-institution.js
src/noosfero-spb/gov_user/public/views/institution-modal.js
src/noosfero-spb/gov_user/test/unit/private_institution_test.rb
src/noosfero-spb/gov_user/test/unit/public_institution_test.rb
src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb
src/noosfero-spb/noosfero-spb-theme/css/modal.css
@@ -148,7 +148,6 @@ class GovUserPlugin &lt; Noosfero::Plugin
     lib/noosfero-root.js
     lib/select-element.js
     lib/select-field-choices.js
-    lib/modal-observer.js
     views/complete-registration.js
     views/control-panel.js
     views/create-institution.js
@@ -6,6 +6,8 @@ class Institution &lt; ActiveRecord::Base
     :display => %w[compact]
   }
+  CNPJ_FORMAT = /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/
+
   def self.default_search_display
     'compact'
   end
@@ -23,7 +25,7 @@ class Institution &lt; ActiveRecord::Base
                   :corporate_name, :siorg_code, :community
   validates :name, :presence=>true, :uniqueness=>true
-  validates :cnpj, :presence=>true, :uniqueness=>true
+  validates :cnpj, :length=>{maximum: 18}
   before_save :verify_institution_type
@@ -34,7 +36,7 @@ class Institution &lt; ActiveRecord::Base
   }
   validate :validate_country, :validate_state, :validate_city,
-           :verify_institution_type, :validate_format_cnpj
+           :verify_institution_type
   def has_accepted_rating? user_rating
@@ -99,18 +101,4 @@ class Institution &lt; ActiveRecord::Base
     return true
   end
-
-  def validate_format_cnpj
-    return true if self.community.blank? && self.community.country != "BR"
-    return true if self.cnpj.blank?
-
-    format =  /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/
-
-    if !self.cnpj.blank? && format.match(self.cnpj)
-      return true
-    else
-      self.errors.add(:cnpj, _("invalid format"))
-      return false
-    end
-  end
 end
 class PrivateInstitution < Institution
+  validates :cnpj,
+            :presence=>true,
+            :format => {with: CNPJ_FORMAT},
+            :if => :is_a_brazilian_institution?
+
+  validates :cnpj,
+            :uniqueness=>true, :unless => 'cnpj.blank?'
+
+  private
+    def is_a_brazilian_institution?
+      self.community.country == "BR"
+    end
 end
@@ -5,9 +5,7 @@ class PublicInstitution &lt; Institution
   validates :acronym, :allow_blank => true, :allow_nil => true,
             :uniqueness=>true
-  validates_format_of(
-    :cnpj,
-    :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/,
-    :allow_nil => true, :allow_blank => true
-  )
+  validates :cnpj,
+            :format => {with: CNPJ_FORMAT},
+            :unless => 'cnpj.blank?'
 end
@@ -172,7 +172,7 @@ msgstr &quot;Nome de Instituição já existe&quot;
 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:44
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:62
 msgid "Corporate Name"
-msgstr "Razão social"
+msgstr "Razão Social"
 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:49
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:79
@@ -1,36 +0,0 @@
-/* globals modulejs */
-
-// Works on: IE 11, Edge 12+, Firefox 40+, Chrome 43+, Opera 32+, Safari 32+
-modulejs.define("ModalObserver", function() {
-  "use strict";
-
-  function ModalObserver(target, callback) {
-    this.action_callback = callback;
-    this.observer = new MutationObserver(this.mutationVerifier.bind(this));
-
-    this.observer.observe(target, {attributes: true});
-  }
-
-
-  ModalObserver.prototype.mutationVerifier = function(mutations) {
-    var callback = this.action_callback;
-    var observer = this.observer;
-
-    mutations.forEach(function(mutation) {
-      if (mutation.attributeName === "style" &&
-          mutation.target.style.display === "none")
-      {
-        callback();
-        // stop the observer, once its action is done
-        observer.disconnect();
-      }
-    });
-  };
-
-
-  return {
-    init: function(target, callback) {
-      new ModalObserver(target, callback);
-    }
-  };
-});
@@ -21,6 +21,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function show_public_institutions_fields() {
     $(".public-institutions-fields").show();
+    $("#cnpj_required_field_mark").html("");
   }
@@ -28,6 +29,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     $(".public-institutions-fields").hide();
     $("#institutions_governmental_power option").selected(0);
     $("#institutions_governmental_sphere option").selected(0);
+    $("#cnpj_required_field_mark").html("(*)");
   }
@@ -64,6 +66,17 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   }
+  // If the page has a user institution list, update it without repeating the institution
+  function update_user_institutions_list() {
+    $(".institution_container").append(get_clone_institution_data(institution_id));
+    add_selected_institution_to_list(institution_id, institution_name);
+
+    $(".remove-institution").click(remove_institution);
+    //$('#institution_dialog').dialog('close');
+    $('#institution_modal').modal('toggle');
+  }
+
+
   function success_ajax_response(response) {
     close_loading();
@@ -75,24 +88,19 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
       window.display_notice(response.message);
       set_institution_field_name($("#community_name").val());
-      //settup_created_institution();
       // Close modal
-      //$(".modal-header .close").trigger("click");
+      $(".modal-header .close").trigger("click");
       // Clear modal fields
       $("#institution_modal_body").html(window.sessionStorage.getItem("InstitutionModalBody"));
+      $(".modal .modal-body div").show();
       // Reset modal events
       init_module();
-
-      // If the page has a user institution list, update it without repeating the institution
-      $(".institution_container").append(get_clone_institution_data(institution_id));
-      add_selected_institution_to_list(institution_id, institution_name);
-      $(".remove-institution").click(remove_institution);
-      //$('#institution_dialog').dialog('close');
-      $('#institution_modal').modal('toggle');
+      // If the user is is his profile edition page
+      update_user_institutions_list();
     } else {
       var errors = create_error_list(response);
       $("#create_institution_errors").switchClass("hide-field", "show-field").html("<h2>"+response.message+"</h2>"+errors);
@@ -271,9 +279,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function add_mask_to_form_items() {
-    if ($.mask) {
-      $("#institutions_cnpj").mask("99.999.999/9999-99");
-    }
+    $("#institutions_cnpj").mask("99.999.999/9999-99");
   }
 /* globals modulejs */
 modulejs.define('InstitutionModal',
-    ['jquery', 'NoosferoRoot', 'CreateInstitution', 'ModalObserver'],
-    function($, NoosferoRoot, CreateInstitution, ModalObserver)
+    ['jquery', 'NoosferoRoot', 'CreateInstitution'],
+    function($, NoosferoRoot, CreateInstitution)
 {
   'use strict';
@@ -11,32 +11,15 @@ modulejs.define(&#39;InstitutionModal&#39;,
       NoosferoRoot.urlWithSubDirectory("/plugin/gov_user/create_institution"),
   };
-  // When the modal is closed, put the community name into the autocomplete
-  function observer_action() {
-    var community_name = $("#community_name").val();
-    $("#input_institution").attr("value", community_name).autocomplete("search");
-
-    // Clear error messages
-    $("#create_institution_errors").html("");
-  }
-
-  // Observe when modal is closed
-  function observe_modal() {
-    var institution_modal = document.querySelector("#institution_modal");
-    ModalObserver.init(institution_modal, observer_action);
-  }
-
-
+  // Get the modal html code and prepare it
   function prepare_institution_modal() {
-    $.get(AJAX_URL.create_institution_modal, function(response){
+    $.get(AJAX_URL.create_institution_modal, function(response) {
       window.sessionStorage.setItem("InstitutionModalBody", response);
       $("#institution_modal_body").html(response);
       // Set all events on modal
       CreateInstitution.init();
     });
-
-    $("#create_institution_link").click(observe_modal);
   }
@@ -19,10 +19,13 @@ class PrivateInstitutionTest &lt; ActiveSupport::TestCase
     Institution.destroy_all
   end
-  should "save without a cnpj" do
+  should "not save without a cnpj" do
     @institution.cnpj = nil
-    assert @institution.save
+    assert_equal false, @institution.save
+
+    @institution.cnpj = "11.111.111/1111-11"
+    assert_equal true, @institution.save
   end
   should "save without fantasy name" do
@@ -31,4 +34,10 @@ class PrivateInstitutionTest &lt; ActiveSupport::TestCase
     assert @institution.save
   end
+
+  should "not verify cnpj if it isnt a brazilian institution" do
+    @institution.cnpj = nil
+    @institution.community.country = "AR"
+    assert_equal true, @institution.save
+  end
 end
@@ -65,4 +65,15 @@ class PublicInstitutionTest &lt; ActiveSupport::TestCase
     assert !@institution.save
     assert @institution.errors.full_messages.include? invalid_msg
   end
+
+
+  should "verify cnpj format if it is filled" do
+    @institution.cnpj = "123456789"
+
+    assert_equal false, @institution.save
+
+    @institution.cnpj = "11.222.333/4444-55"
+
+    assert_equal true, @institution.save
+  end
 end
@@ -2,7 +2,7 @@
   <div class="spb-row no-margin-top">
     <% if environment.enabled?('admin_must_approve_new_communities') %>
       <div class='spb-col spb-col-12 explanation'>
-        <%= _("Note that the creation of communities in this environment is restricted. Your request to create this new community will be sent to %{environment} administrators and will be approved or rejected according to their methods and criteria.") % { :environment => environment.name }%>
+        <%= _("Note that the creation of institutions in this environment is restricted. Your request to create this new community will be sent to %{environment} administrators and will be approved or rejected according to their methods and criteria.") % { :environment => environment.name }%>
       </div>
     <% end %>
   </div>
@@ -107,7 +107,7 @@
       <div class="spb-col spb-col-12">
          <label class="formlabel" for="institutions_cnpj">
           <%= _("CNPJ") %>
-          <span class="required-field">(*)</span>
+          <span id="cnpj_required_field_mark" class="required-field"></span>
         </label>
         <%= inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => params[:institutions][:cnpj]) %>
       </div>
@@ -154,7 +154,7 @@
         <%= inst.select(:juridical_nature, @juridical_nature, :selected=>params[:institutions][:juridical_nature], :class => flash[:error_institution_juridical_nature])%>
       </div>
     </div>
-    
+
     <div class="spb-row public-institutions-fields">
       <div class="spb-col spb-col-12">
         <%= _("SISP ?") %>
@@ -161,11 +161,18 @@
 .modal .explanation {
   color: #3F60C6;
   font-size: 12px;
+  font-style: normal;
+  font-family: 'open_sansitalic';
 }
 .modal .required-field, .modal .errorExplanation {
   color: #EA1C00;
   font-size:12px;
+  margin-bottom: 20px;
+}
+
+.modal .required-field, .modal .errorExplanation:empty {
+  margin-bottom: 0px;
 }
 .modal .spb-row {
1	class PrivateInstitution < Institution	1	class PrivateInstitution < Institution
		2	+ validates :cnpj,
		3	+ :presence=>true,
		4	+ :format => {with: CNPJ_FORMAT},
		5	+ :if => :is_a_brazilian_institution?
		6	+
		7	+ validates :cnpj,
		8	+ :uniqueness=>true, :unless => 'cnpj.blank?'
		9	+
		10	+ private
		11	+ def is_a_brazilian_institution?
		12	+ self.community.country == "BR"
		13	+ end
2	end	14	end
	@@ -172,7 +172,7 @@ msgstr "Nome de Instituição já existe"		@@ -172,7 +172,7 @@ msgstr "Nome de Instituição já existe"
172	#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:44	172	#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:44
173	#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:62	173	#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:62
174	msgid "Corporate Name"	174	msgid "Corporate Name"
175	-msgstr "Razão social"	175	+msgstr "Razão Social"
176		176
177	#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:49	177	#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:49
178	#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:79	178	#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:79
	@@ -1,36 +0,0 @@	@@ -1,36 +0,0 @@
1	-/* globals modulejs */
2	-
3	-// Works on: IE 11, Edge 12+, Firefox 40+, Chrome 43+, Opera 32+, Safari 32+
4	-modulejs.define("ModalObserver", function() {
5	- "use strict";
6	-
7	- function ModalObserver(target, callback) {
8	- this.action_callback = callback;
9	- this.observer = new MutationObserver(this.mutationVerifier.bind(this));
10	-
11	- this.observer.observe(target, {attributes: true});
12	- }
13	-
14	-
15	- ModalObserver.prototype.mutationVerifier = function(mutations) {
16	- var callback = this.action_callback;
17	- var observer = this.observer;
18	-
19	- mutations.forEach(function(mutation) {
20	- if (mutation.attributeName === "style" &&
21	- mutation.target.style.display === "none")
22	- {
23	- callback();
24	- // stop the observer, once its action is done
25	- observer.disconnect();
26	- }
27	- });
28	- };
29	-
30	-
31	- return {
32	- init: function(target, callback) {
33	- new ModalObserver(target, callback);
34	- }
35	- };
36	-});
	@@ -65,4 +65,15 @@ class PublicInstitutionTest < ActiveSupport::TestCase		@@ -65,4 +65,15 @@ class PublicInstitutionTest < ActiveSupport::TestCase
65	assert !@institution.save	65	assert !@institution.save
66	assert @institution.errors.full_messages.include? invalid_msg	66	assert @institution.errors.full_messages.include? invalid_msg
67	end	67	end
		68	+
		69	+
		70	+ should "verify cnpj format if it is filled" do
		71	+ @institution.cnpj = "123456789"
		72	+
		73	+ assert_equal false, @institution.save
		74	+
		75	+ @institution.cnpj = "11.222.333/4444-55"
		76	+
		77	+ assert_equal true, @institution.save
		78	+ end
68	end	79	end
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	<div class="spb-row no-margin-top">	2	<div class="spb-row no-margin-top">
3	<% if environment.enabled?('admin_must_approve_new_communities') %>	3	<% if environment.enabled?('admin_must_approve_new_communities') %>
4	<div class='spb-col spb-col-12 explanation'>	4	<div class='spb-col spb-col-12 explanation'>
5	- <%= _("Note that the creation of communities in this environment is restricted. Your request to create this new community will be sent to %{environment} administrators and will be approved or rejected according to their methods and criteria.") % { :environment => environment.name }%>	5	+ <%= _("Note that the creation of institutions in this environment is restricted. Your request to create this new community will be sent to %{environment} administrators and will be approved or rejected according to their methods and criteria.") % { :environment => environment.name }%>
6	</div>	6	</div>
7	<% end %>	7	<% end %>
8	</div>	8	</div>
	@@ -107,7 +107,7 @@		@@ -107,7 +107,7 @@
107	<div class="spb-col spb-col-12">	107	<div class="spb-col spb-col-12">
108	<label class="formlabel" for="institutions_cnpj">	108	<label class="formlabel" for="institutions_cnpj">
109	<%= _("CNPJ") %>	109	<%= _("CNPJ") %>
110	- <span class="required-field">(*)</span>	110	+ <span id="cnpj_required_field_mark" class="required-field"></span>
111	</label>	111	</label>
112	<%= inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => params[:institutions][:cnpj]) %>	112	<%= inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => params[:institutions][:cnpj]) %>
113	</div>	113	</div>
	@@ -154,7 +154,7 @@		@@ -154,7 +154,7 @@
154	<%= inst.select(:juridical_nature, @juridical_nature, :selected=>params[:institutions][:juridical_nature], :class => flash[:error_institution_juridical_nature])%>	154	<%= inst.select(:juridical_nature, @juridical_nature, :selected=>params[:institutions][:juridical_nature], :class => flash[:error_institution_juridical_nature])%>
155	</div>	155	</div>
156	</div>	156	</div>
157	-	157	+
158	<div class="spb-row public-institutions-fields">	158	<div class="spb-row public-institutions-fields">
159	<div class="spb-col spb-col-12">	159	<div class="spb-col spb-col-12">
160	<%= _("SISP ?") %>	160	<%= _("SISP ?") %>