check_all_manage_fields:

- When the field "check/uncheck all" is checked or unchecked, all fields below are checked or unchecked - Corrected onclick events on active/required/signup fields - Replaced javascript logic from person/community/enterprise to a single javascript file - Cucumber tests for check/uncheck all fields (ActionItem2962) Signed-off-by: Alex Campelo <campelo.al1@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fábio Teixeira <fabio1079@gmail.com> Signed-off-by: Gustavo Cruz <darksshades@hotmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com> Signed-off-by: Renan Costa <renan2727@hotmail.com>

check_all_manage_fields:
- When the field "check/uncheck all" is checked or unchecked, all fields below are checked or unchecked - Corrected onclick events on active/required/signup fields - Replaced javascript logic from person/community/enterprise to a single javascript file - Cucumber tests for check/uncheck all fields (ActionItem2962) Signed-off-by: Alex Campelo <campelo.al1@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fábio Teixeira <fabio1079@gmail.com> Signed-off-by: Gustavo Cruz <darksshades@hotmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com> Signed-off-by: Renan Costa <renan2727@hotmail.com>
Fabio Teixeira · David Silva
1 parent 764f2771
Showing 6 changed files with 222 additions and 21 deletions Show diff stats
app/views/features/_manage_community_fields.rhtml
app/views/features/_manage_enterprise_fields.rhtml
app/views/features/_manage_person_fields.rhtml
app/views/features/manage_fields.rhtml
features/manage_fields.feature
public/javascripts/manage-fields.js
@@ -9,21 +9,37 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on creation?') %></th>
   </tr>
+
+  <tr style="border-bottom:solid 2px #000">
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="community_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="community_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="community_signup" />
+    </td>
+  </tr>
+
   <% @community_fields.each do |field| %>
   <tr>
     <td><label for="community_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][active]", false %>
-      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=$('community_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "active_action(this, 'community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][required]", false %>
-      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "if(this.checked) $('community_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "required_action('community_fields[#{field}][active]','community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "community_fields[#{field}][signup]", false %>
-      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "if(!this.checked) $('community_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "signup_action('community_fields[#{field}][active]','community_fields[#{field}][required]', 'community_fields[#{field}][signup]')" %>
     </td>
   </tr>
@@ -31,18 +47,18 @@
 </table>
 <script type='text/javascript'>
-  var trs = $$('#community_fields_conf tr');
+  var trs = jQuery('#community_fields_conf tr');
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
 </script>
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_community_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
@@ -9,21 +9,37 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on registration?') %></th>
   </tr>
+
+  <tr style="border-bottom:solid 2px #000">
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="enterprise_signup" />
+    </td>
+  </tr>
+
   <% @enterprise_fields.each do |field| %>
   <tr>
     <td><label for="enterprise_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][active]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "active_action(this, 'enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][required]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "required_action('enterprise_fields[#{field}][active]','enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "enterprise_fields[#{field}][signup]", false %>
-      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "signup_action('enterprise_fields[#{field}][active]','enterprise_fields[#{field}][required]', 'enterprise_fields[#{field}][signup]')" %>
     </td>
   </tr>
@@ -31,18 +47,18 @@
 </table>
 <script type='text/javascript'>
-  var trs = $$('#enterprise_fields_conf tr');
+  var trs = jQuery('#enterprise_fields_conf tr');
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
 </script>
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_enterprise_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
@@ -9,31 +9,48 @@
     <th><%= _('Required') %></th>
     <th><%= _('Display on signup?') %></th>
   </tr>
+
+  <tr style="border-bottom:solid 2px #000">
+    <td>
+      <%= _("Check/Uncheck All")%>
+    </td>
+    <td>
+      <input type="checkbox" id="person_active" />
+    </td>
+    <td>
+      <input type="checkbox" id="person_required" />
+    </td>
+    <td>
+      <input type="checkbox" id="person_signup" />
+    </td>
+  </tr>
+
   <% @person_fields.each do |field| %>
   <tr>
     <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][active]", false %>
-      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>
+      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "active_action(this, 'person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][required]", false %>
-      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>
+      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "required_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
     <td>
       <%= hidden_field_tag  "person_fields[#{field}][signup]", false %>
-      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>
+      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "signup_action('person_fields[#{field}][active]','person_fields[#{field}][required]', 'person_fields[#{field}][signup]')" %>
     </td>
   </tr>
   <% end %>
 </table>
 <script type='text/javascript'>// <!--
-  var trs = $$('#person_fields_conf tr');
+  var trs = jQuery('#person_fields_conf tr');
+
   var tr, td2;
-  for ( var i=0; tr=trs[i]; i++ ) {
+  for ( var i=2; tr=trs[i]; i++ ) {
     if ( td2 = tr.getElementsByTagName('td')[1] ) {
-      td2.getElementsByTagName('input')[0].onclick();
+      td2.getElementsByTagName('input')[1].onclick();
     }
   }
   // -->
@@ -41,7 +58,7 @@
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', _('Save changes'), :id=>"save_person_fields") %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
+<%= javascript_include_tag "manage-fields.js" %>
+
 <%= render :partial => 'manage_person_fields' %>
 <% if !environment.enabled?('disable_asset_enterprises') %>
@@ -0,0 +1,67 @@
+Feature: check all manage fields
+  As an administrator
+  I want to check and uncheck all person, enterprise and community's fields
+
+  Background:
+    Given the following users
+      | login      | name        |
+      | mariasilva | Maria Silva |
+    And the following enterprises
+      | identifier   | owner      | name         | contact_email               | contact_phone  | enabled |
+      | paper-street | mariasilva | Paper Street | marial.silva@workerbees.org | (288) 555-0153 | true    |
+    And the following community
+      | identifier  | name         |
+      | mycommunity | My Community |
+    And "Maria Silva" is admin of "My Community"
+    And I am logged in as admin
+    And I go to /admin/features/manage_fields
+
+  @selenium
+  Scenario: check all active person fields
+    Given I check "person_active"
+    And I press "save_person_fields"
+    And I follow "Control panel"
+    When I follow "Edit Profile"
+    Then I should see "Custom area of study"
+
+  @selenium
+  Scenario: check all active enterprise fields
+    Given I check "enterprise_active"
+    And I press "save_enterprise_fields"
+    When I go to /myprofile/paper-street/profile_editor/edit
+    Then I should see "Historic and current context"
+
+  @selenium
+  Scenario: check all active community fields
+    Given I check "community_active"
+    And I press "save_community_fields"
+    When I go to /myprofile/mycommunity/profile_editor/edit
+    Then I should see "Economic activity"
+
+  @selenium
+  Scenario: uncheck Check/Uncheck All active person field
+    Given I check "person_active"
+    And I press "save_person_fields"
+    And I uncheck "person_active"
+    And I press "save_person_fields"
+    And I follow "Control panel"
+    When I follow "Edit Profile"
+    Then I should not see "Custom area of study"
+
+  @selenium
+  Scenario: uncheck Check/Uncheck All active community field
+    Given I check "community_active"
+    And I press "save_community_fields"
+    And I uncheck "community_active"
+    And I press "save_community_fields"
+    When I go to /myprofile/mycommunity/profile_editor/edit
+    Then I should not see "Economic activity"
+
+  @selenium
+  Scenario: uncheck Check/Uncheck All active enterprise field
+    Given I check "enterprise_active"
+    And I press "save_enterprise_fields"
+    And I uncheck "enterprise_active"
+    And I press "save_enterprise_fields"
+    When I go to /myprofile/paper-street/profile_editor/edit
+    Then I should not see "Historic and current context"
 \ No newline at end of file
@@ -0,0 +1,83 @@
+function update_active(name_active, name_required, name_signup) {
+  var required = jQuery("input[name='" + name_required + "']")[1]
+  var signup = jQuery("input[name='" + name_signup + "']")[1]
+  var active = jQuery("input[name='" + name_active + "']")[1]
+
+  if(required.checked || signup.checked)
+    active.checked = true
+}
+
+function active_action(obj_active, name_required, name_signup) {
+  var required = jQuery("input[name='" + name_required + "']")[0]
+  var signup = jQuery("input[name='" + name_signup + "']")[0]
+
+  required.disabled = signup.disabled = !obj_active.checked
+}
+
+function required_action(name_active, name_required, name_signup) {
+  var obj_required = jQuery("input[name='" + name_required + "']")[1]
+
+  if(obj_required.checked) {
+    jQuery("input[name='" + name_signup + "']")[0].checked = true
+    jQuery("input[name='" + name_signup + "']")[1].checked = true
+  }
+
+  update_active(name_active, name_required, name_signup)
+}
+
+function signup_action(name_active, name_required, name_signup) {
+  var obj_signup = jQuery("input[name='" + name_signup + "']")[1]
+
+  if(!obj_signup.checked) {
+    jQuery("input[name='" + name_required + "']")[0].checked = false
+    jQuery("input[name='" + name_required + "']")[1].checked = false
+  }
+
+  update_active(name_active, name_required, name_signup)
+}
+
+
+jQuery(document).ready(function(){
+  function check_fields(check, table_id, start) {
+    var checkboxes = jQuery("#" + table_id + " tbody tr td input[type='checkbox']")
+    for (var i = start; i < checkboxes.length; i+=3) {
+      checkboxes[i].checked = check
+    }
+  }
+
+  function verify_checked(fields_id){
+    var checkboxes = jQuery("#" + fields_id + "_fields_conf tbody tr td input[type='checkbox']")
+    for (var i = 2; i >= 0; i--) {
+      var allchecked = true
+      for (var j = i+3; j < checkboxes.length; j+=3) {
+        if(!checkboxes[j].checked) {
+          allchecked = false
+          break
+        }
+      }
+
+      var checkbox = jQuery(checkboxes[i+3]).attr("id").split("_")
+      jQuery("#" + checkbox.first() + "_" + checkbox.last()).attr("checked", allchecked)
+    }
+  }
+
+  function check_all(fields_id) {
+    jQuery("#" + fields_id + "_active").click(function (){check_fields(this.checked, fields_id + "_fields_conf", 0)})
+    jQuery("#" + fields_id + "_required").click(function (){check_fields(this.checked, fields_id + "_fields_conf", 1)})
+    jQuery("#" + fields_id +"_signup").click(function (){check_fields(this.checked, fields_id + "_fields_conf", 2)})
+    verify_checked(fields_id)
+  }
+
+  check_all("person")
+  check_all("enterprise")
+  check_all("community")
+
+  jQuery("input[type='checkbox']").click(function (){
+    var checkbox = jQuery(this).attr("id").split("_")
+    verify_checked(checkbox.first())
+
+    if(this.checked == false) {
+      jQuery("#" + checkbox.first() + "_" + checkbox.last()).attr("checked", false)
+    }
+  })
+})
		1	+<%= javascript_include_tag "manage-fields.js" %>
		2	+
1	<%= render :partial => 'manage_person_fields' %>	3	<%= render :partial => 'manage_person_fields' %>
2		4
3	<% if !environment.enabled?('disable_asset_enterprises') %>	5	<% if !environment.enabled?('disable_asset_enterprises') %>
	@@ -0,0 +1,67 @@		@@ -0,0 +1,67 @@
		1	+Feature: check all manage fields
		2	+ As an administrator
		3	+ I want to check and uncheck all person, enterprise and community's fields
		4	+
		5	+ Background:
		6	+ Given the following users
		7	+ \| login \| name \|
		8	+ \| mariasilva \| Maria Silva \|
		9	+ And the following enterprises
		10	+ \| identifier \| owner \| name \| contact_email \| contact_phone \| enabled \|
		11	+ \| paper-street \| mariasilva \| Paper Street \| marial.silva@workerbees.org \| (288) 555-0153 \| true \|
		12	+ And the following community
		13	+ \| identifier \| name \|
		14	+ \| mycommunity \| My Community \|
		15	+ And "Maria Silva" is admin of "My Community"
		16	+ And I am logged in as admin
		17	+ And I go to /admin/features/manage_fields
		18	+
		19	+ @selenium
		20	+ Scenario: check all active person fields
		21	+ Given I check "person_active"
		22	+ And I press "save_person_fields"
		23	+ And I follow "Control panel"
		24	+ When I follow "Edit Profile"
		25	+ Then I should see "Custom area of study"
		26	+
		27	+ @selenium
		28	+ Scenario: check all active enterprise fields
		29	+ Given I check "enterprise_active"
		30	+ And I press "save_enterprise_fields"
		31	+ When I go to /myprofile/paper-street/profile_editor/edit
		32	+ Then I should see "Historic and current context"
		33	+
		34	+ @selenium
		35	+ Scenario: check all active community fields
		36	+ Given I check "community_active"
		37	+ And I press "save_community_fields"
		38	+ When I go to /myprofile/mycommunity/profile_editor/edit
		39	+ Then I should see "Economic activity"
		40	+
		41	+ @selenium
		42	+ Scenario: uncheck Check/Uncheck All active person field
		43	+ Given I check "person_active"
		44	+ And I press "save_person_fields"
		45	+ And I uncheck "person_active"
		46	+ And I press "save_person_fields"
		47	+ And I follow "Control panel"
		48	+ When I follow "Edit Profile"
		49	+ Then I should not see "Custom area of study"
		50	+
		51	+ @selenium
		52	+ Scenario: uncheck Check/Uncheck All active community field
		53	+ Given I check "community_active"
		54	+ And I press "save_community_fields"
		55	+ And I uncheck "community_active"
		56	+ And I press "save_community_fields"
		57	+ When I go to /myprofile/mycommunity/profile_editor/edit
		58	+ Then I should not see "Economic activity"
		59	+
		60	+ @selenium
		61	+ Scenario: uncheck Check/Uncheck All active enterprise field
		62	+ Given I check "enterprise_active"
		63	+ And I press "save_enterprise_fields"
		64	+ And I uncheck "enterprise_active"
		65	+ And I press "save_enterprise_fields"
		66	+ When I go to /myprofile/paper-street/profile_editor/edit
		67	+ Then I should not see "Historic and current context"
0	\ No newline at end of file	68	\ No newline at end of file
@@ -0,0 +1,83 @@		@@ -0,0 +1,83 @@
	1	+function update_active(name_active, name_required, name_signup) {
	2	+ var required = jQuery("input[name='" + name_required + "']")[1]
	3	+ var signup = jQuery("input[name='" + name_signup + "']")[1]
	4	+ var active = jQuery("input[name='" + name_active + "']")[1]
	5	+
	6	+ if(required.checked \|\| signup.checked)
	7	+ active.checked = true
	8	+}
	9	+
	10	+function active_action(obj_active, name_required, name_signup) {
	11	+ var required = jQuery("input[name='" + name_required + "']")[0]
	12	+ var signup = jQuery("input[name='" + name_signup + "']")[0]
	13	+
	14	+ required.disabled = signup.disabled = !obj_active.checked
	15	+}
	16	+
	17	+function required_action(name_active, name_required, name_signup) {
	18	+ var obj_required = jQuery("input[name='" + name_required + "']")[1]
	19	+
	20	+ if(obj_required.checked) {
	21	+ jQuery("input[name='" + name_signup + "']")[0].checked = true
	22	+ jQuery("input[name='" + name_signup + "']")[1].checked = true
	23	+ }
	24	+
	25	+ update_active(name_active, name_required, name_signup)
	26	+}
	27	+
	28	+function signup_action(name_active, name_required, name_signup) {
	29	+ var obj_signup = jQuery("input[name='" + name_signup + "']")[1]
	30	+
	31	+ if(!obj_signup.checked) {
	32	+ jQuery("input[name='" + name_required + "']")[0].checked = false
	33	+ jQuery("input[name='" + name_required + "']")[1].checked = false
	34	+ }
	35	+
	36	+ update_active(name_active, name_required, name_signup)
	37	+}
	38	+
	39	+
	40	+jQuery(document).ready(function(){
	41	+ function check_fields(check, table_id, start) {
	42	+ var checkboxes = jQuery("#" + table_id + " tbody tr td input[type='checkbox']")
	43	+ for (var i = start; i < checkboxes.length; i+=3) {
	44	+ checkboxes[i].checked = check
	45	+ }
	46	+ }
	47	+
	48	+ function verify_checked(fields_id){
	49	+ var checkboxes = jQuery("#" + fields_id + "_fields_conf tbody tr td input[type='checkbox']")
	50	+ for (var i = 2; i >= 0; i--) {
	51	+ var allchecked = true
	52	+ for (var j = i+3; j < checkboxes.length; j+=3) {
	53	+ if(!checkboxes[j].checked) {
	54	+ allchecked = false
	55	+ break
	56	+ }
	57	+ }
	58	+
	59	+ var checkbox = jQuery(checkboxes[i+3]).attr("id").split("_")
	60	+ jQuery("#" + checkbox.first() + "_" + checkbox.last()).attr("checked", allchecked)
	61	+ }
	62	+ }
	63	+
	64	+ function check_all(fields_id) {
	65	+ jQuery("#" + fields_id + "_active").click(function (){check_fields(this.checked, fields_id + "_fields_conf", 0)})
	66	+ jQuery("#" + fields_id + "_required").click(function (){check_fields(this.checked, fields_id + "_fields_conf", 1)})
	67	+ jQuery("#" + fields_id +"_signup").click(function (){check_fields(this.checked, fields_id + "_fields_conf", 2)})
	68	+ verify_checked(fields_id)
	69	+ }
	70	+
	71	+ check_all("person")
	72	+ check_all("enterprise")
	73	+ check_all("community")
	74	+
	75	+ jQuery("input[type='checkbox']").click(function (){
	76	+ var checkbox = jQuery(this).attr("id").split("_")
	77	+ verify_checked(checkbox.first())
	78	+
	79	+ if(this.checked == false) {
	80	+ jQuery("#" + checkbox.first() + "_" + checkbox.last()).attr("checked", false)
	81	+ }
	82	+ })
	83	+})