ActionItem1127: allowing enterprises to add members

* added loading image * added drag and drop * turned unassociate to AJAX * adding members via ajax * added the user finding via ajax

ActionItem1127: allowing enterprises to add members
* added loading image * added drag and drop * turned unassociate to AJAX * adding members via ajax * added the user finding via ajax
Daniela Feitosa · Antonio Terceiro
1 parent b61c5145
Showing 12 changed files with 256 additions and 23 deletions Show diff stats
app/controllers/my_profile/profile_members_controller.rb
app/views/profile_members/_find_users.rhtml
app/views/profile_members/_members_list.rhtml
app/views/profile_members/add_member.rhtml
app/views/profile_members/add_members.rhtml
app/views/profile_members/find_users.rhtml
app/views/profile_members/index.rhtml
app/views/profile_members/unassociate.rhtml
public/designs/icons/tango/style.css
public/images/grip-clue.png
public/stylesheets/controller_profile_members.css
test/functional/profile_members_controller_test.rb
 class ProfileMembersController < MyProfileController
   protect 'manage_memberships', :profile
+  no_design_blocks
   def index
     @members = profile.members
@@ -43,7 +44,7 @@ class ProfileMembersController &lt; MyProfileController
     else
       flash[:notice] = 'Failed to unassociate member'
     end
-    redirect_to :aciton => 'index'
+    render :layout => false
   end
   def unassociate
@@ -56,7 +57,23 @@ class ProfileMembersController &lt; MyProfileController
         flash[:notice] = 'Failed to unassociate member'
       end
     end
-    redirect_to :action => 'index'
+    render :layout => false
+  end
+
+  def add_members
+  end
+
+  def add_member
+    if profile.enterprise?
+      member = Person.find_by_identifier(params[:id])
+      member.define_roles(Profile::Roles.all_roles(environment), profile)
+    end
+    render :layout => false
+  end
+
+  def find_users
+    @users_found = Person.find_by_contents(params[:query])
+    render :layout => false
   end
 end
@@ -0,0 +1 @@
+find_users.rhtml
 \ No newline at end of file
@@ -0,0 +1,24 @@
+<h3><%= _('Current Members') %></h3>
+
+<table>
+  <tr>
+    <th><%= _('Member') %></th>
+    <th><%= _('Actions') %></th>
+  </tr>
+  <% profile.members.each do |m| %>
+    <tr>
+      <td><%= link_to_profile m.short_name, m.identifier, :title => m.name %> </td>
+      <td>
+        <div class="members-buttons-cell">
+          <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
+          <%= button_to_remote_without_text :remove, _('Remove'),
+                :update => 'members-list',
+                :loading => '$("members-list").addClassName("loading")',
+                :success => "$('tr-#{m.identifier}').show()",
+                :complete => '$("members-list").removeClassName("loading")',
+                :url => {:action => 'unassociate', :id => m} %>
+        </div>
+      </td>
+    </tr>
+  <% end %>
+</table>
@@ -0,0 +1 @@
+_members_list.rhtml
 \ No newline at end of file
@@ -0,0 +1,25 @@
+<h2><%= _('Add members to %s') % profile.name %></h2>
+
+<% form_remote_tag :url => {:action => 'find_users', :profile => profile.identifier}, :update => 'users-list', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")' do %>
+  <%= text_field_tag('query') %>
+  <%= submit_tag(_('Search')) %>
+<% end %>
+
+<%= observe_field('query', :url => {:action => 'find_users', :profile => profile.identifier}, :update => 'users-list', :frequency => 1, :with => 'query', :condition => '$("query").value.length > 2', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")') %>
+
+<div id="users-list">
+  <%= render :partial => 'find_users' %>
+</div>
+
+<div id="members-list" class="add-members">
+  <%= render :partial => 'members_list' %>
+</div>
+<%= drop_receiving_element('members-list',
+                           :url => {:action => 'add_member', :profile => profile.identifier},
+                           :before => '$("tr-" + element.id).hide()',
+                           :loading => '$("members-list").addClassName("loading")',
+                           :update => 'members-list',
+                           :success => '$("tr-" + element.id).hide(); $(element.id).show();',
+                           :complete => '$("members-list").removeClassName("loading")') %>
+
+<br style="clear:both" />
@@ -0,0 +1,28 @@
+<h3> <%= _('Users') %> </h3>
+<table>
+  <tr><th><%= _('Name') %></th><th></th></tr>
+  <% @users_found.each do |user| %>
+    <tr id="tr-<%= user.identifier %>"<%= profile.members.include?(user) ? 'style="display:none"' : '' %>>
+      <td>
+        <div id="<%= user.identifier %>" class="draggable-user">
+          <%= image_tag('/images/grip-clue.png') %>
+          <%= profile_image(user, :icon) %>
+          <%= [link_to_profile(user.short_name + " (#{user.identifier})", user.identifier, :title => user.name),
+               (user.sex ? gettext(user.sex.capitalize) : _('Sex not informed')),
+               user.location.empty? ? nil : user.location ].compact.join(' &#151; ') %>
+        </div>
+        <%= draggable_element(user.identifier, :revert => true) %>
+      </td>
+      <td>
+        <%= button_to_remote_without_text(:add, _('Add member'),
+                                          { :loading => '$("members-list").addClassName("loading")',
+                                            :update => 'members-list',
+                                            :url => {:action => 'add_member', :profile => profile.identifier, :id => user.identifier},
+                                            :success => "$('tr-#{user.identifier}').hide()",
+                                            :complete => '$("members-list").removeClassName("loading")'}) %>
+
+
+      </td>
+    </tr>
+  <% end if @users_found %>
+</table>
-<h2> <%= _('Listing Members') %> </h2>
-
-<%= link_to _('Affiliate yourself'), :action => 'add_role', :person => current_user.person, :role => @member_role if @member_role %>
-
-<table>
-  <tr>
-    <th><%= _('Member') %></th>
-    <th><%= _('Actions') %></th>
-  </tr>
-  <% @members.each do |m| %>
-    <tr>
-      <td><%= m.name %> </td>
-      <td>
-        <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
-        <%= button_without_text :delete, _('Remove'), :action => 'unassociate', :id => m %>
-      </td>
-    </tr>
-  <% end %>
-</table>
+<div id="members-list">
+  <%= render :partial => 'members_list' %>
+</div>
 <% button_bar do %>
   <%= button :back, _('Back'), :controller => 'profile_editor' %>
+  <%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>
 <% end %>
@@ -0,0 +1 @@
+_members_list.rhtml
 \ No newline at end of file
@@ -17,6 +17,7 @@
 .icon-back      { background-image: url(Tango/16x16/actions/back.png)          }
 .icon-next      { background-image: url(Tango/16x16/actions/go-next.png)  }
 .icon-add       { background-image: url(Tango/16x16/actions/add.png)              }
+.icon-remove    { background-image: url(Tango/16x16/actions/gtk-remove.png)              }
 .icon-more      { background-image: url(Tango/16x16/actions/add.png)              }
 .icon-up        { background-image: url(Tango/16x16/actions/go-up.png)            }
 .icon-down      { background-image: url(Tango/16x16/actions/go-down.png)          }
@@ -0,0 +1,54 @@
+.no-boxes {
+  margin: 30px
+}
+
+#users-list {
+  float: left;
+  width: 60%;
+}
+
+.msie6 #users-list {
+  position: relative;
+}
+
+#users-list a.icon-add{
+  float: right;
+}
+
+.msie #users-list a.icon-add{
+  display: block;
+}
+
+.draggable-user {
+  xwidth: 170px;
+  cursor: move;
+}
+
+#members-list.add-members {
+  float: right;
+  width: 30%;
+  text-align: center;
+}
+
+.members-buttons-cell {
+  width: 60px;
+}
+
+.msie .members-buttons-cell a {
+  position: relative;
+  display: block;
+  float: left;
+}
+
+.msie6 .button-bar a {
+  position: relative;
+}
+
+.loading {
+  cursor: progress;
+  background: transparent url(../images/loading.gif) no-repeat scroll center 50px;
+}
+
+table {
+  text-align: left;
+}
@@ -90,8 +90,8 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase
     login_as :admin_user
     get :unassociate, :profile => com.identifier, :id => member
-    assert_response :redirect
-    assert_redirected_to :action => 'index'
+    assert_response :success
+    assert_equal nil, @response.layout
     member.reload
     com.reload
     assert_not_includes com.members, member
@@ -112,4 +112,100 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase
     assert_not_includes assigns(:roles), role
   end
+  should 'enterprises have a add members button' do
+    ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
+    u = create_user_with_permission('test_user', 'manage_memberships', ent)
+    login_as :test_user
+
+    get :index, :profile => ent.identifier
+    assert_tag :tag => 'a', :attributes => {:href => /add_members/}
+  end
+
+  should 'not display add members button for communities' do
+    com = Community.create!(:name => 'Test Com', :identifier => 'test_com')
+    u = create_user_with_permission('test_user', 'manage_memberships', com)
+    login_as :test_user
+
+    get :index, :profile => com.identifier
+    assert_no_tag :tag => 'a', :attributes => {:href => /add_members/}
+  end
+
+  should 'have a add_members page' do
+    ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
+    u = create_user_with_permission('test_user', 'manage_memberships', ent)
+    login_as :test_user
+
+    assert_nothing_raised do
+      get :add_members, :profile => ent.identifier
+    end
+
+  end
+
+  should 'list current members when adding new members' do
+    ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
+    p = create_user_with_permission('test_user', 'manage_memberships', ent)
+    login_as :test_user
+
+    get :add_members, :profile => ent.identifier
+    ent.reload
+    assert_includes ent.members, p
+  end
+
+  should 'add member to profile' do
+    ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
+    p = create_user_with_permission('test_user', 'manage_memberships', ent)
+    login_as :test_user
+
+    u = create_user('member_wannabe').person
+    post :add_member, :profile => ent.identifier, :id => u.identifier
+    ent.reload
+
+    assert_includes ent.members, p
+    assert_includes ent.members, u
+  end
+
+  should 'add member with all roles' do
+    ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
+    p = create_user_with_permission('test_user', 'manage_memberships', ent)
+    login_as :test_user
+
+    u = create_user('member_wannabe').person
+    post :add_member, :profile => ent.identifier, :id => u.identifier
+
+    assert_equivalent Profile::Roles.all_roles(ent.environment).compact, u.role_assignments.find_all_by_resource_id(ent.id).map(&:role).compact
+  end
+
+  should 'not add member to community' do
+    com = Community.create!(:name => 'Test Com', :identifier => 'test_com')
+    p = create_user_with_permission('test_user', 'manage_memberships', com)
+    login_as :test_user
+
+    u = create_user('member_wannabe').person
+    post :add_member, :profile => com.identifier, :id => u.identifier
+    com.reload
+
+    assert_not_includes com.members, u
+  end
+
+  should 'find users' do
+    ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
+    user = create_user('test_user').person
+    u = create_user_with_permission('ent_user', 'manage_memberships', ent)
+    login_as :ent_user
+
+    get :find_users, :profile => ent.identifier, :query => 'test*'
+
+    assert_includes assigns(:users_found), user
+  end
+
+  should 'not appear add button for member in add members page' do
+    ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
+    p = create_user_with_permission('test_user', 'manage_memberships', ent)
+    login_as :test_user
+
+    get :find_users, :profile => ent.identifier, :query => 'test*'
+
+    assert_tag :tag => 'tr', :attributes => {:id => 'tr-test_user', :style => 'display:none'}
+  end
+
 end
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+find_users.rhtml
0	\ No newline at end of file	2	\ No newline at end of file
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+<h3><%= _('Current Members') %></h3>
	2	+
	3	+<table>
	4	+ <tr>
	5	+ <th><%= _('Member') %></th>
	6	+ <th><%= _('Actions') %></th>
	7	+ </tr>
	8	+ <% profile.members.each do \|m\| %>
	9	+ <tr>
	10	+ <td><%= link_to_profile m.short_name, m.identifier, :title => m.name %> </td>
	11	+ <td>
	12	+ <div class="members-buttons-cell">
	13	+ <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
	14	+ <%= button_to_remote_without_text :remove, _('Remove'),
	15	+ :update => 'members-list',
	16	+ :loading => '$("members-list").addClassName("loading")',
	17	+ :success => "$('tr-#{m.identifier}').show()",
	18	+ :complete => '$("members-list").removeClassName("loading")',
	19	+ :url => {:action => 'unassociate', :id => m} %>
	20	+ </div>
	21	+ </td>
	22	+ </tr>
	23	+ <% end %>
	24	+</table>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+_members_list.rhtml
0	\ No newline at end of file	2	\ No newline at end of file
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+<h2><%= _('Add members to %s') % profile.name %></h2>
	2	+
	3	+<% form_remote_tag :url => {:action => 'find_users', :profile => profile.identifier}, :update => 'users-list', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")' do %>
	4	+ <%= text_field_tag('query') %>
	5	+ <%= submit_tag(_('Search')) %>
	6	+<% end %>
	7	+
	8	+<%= observe_field('query', :url => {:action => 'find_users', :profile => profile.identifier}, :update => 'users-list', :frequency => 1, :with => 'query', :condition => '$("query").value.length > 2', :loading => '$("users-list").addClassName("loading")', :complete => '$("users-list").removeClassName("loading")') %>
	9	+
	10	+<div id="users-list">
	11	+ <%= render :partial => 'find_users' %>
	12	+</div>
	13	+
	14	+<div id="members-list" class="add-members">
	15	+ <%= render :partial => 'members_list' %>
	16	+</div>
	17	+<%= drop_receiving_element('members-list',
	18	+ :url => {:action => 'add_member', :profile => profile.identifier},
	19	+ :before => '$("tr-" + element.id).hide()',
	20	+ :loading => '$("members-list").addClassName("loading")',
	21	+ :update => 'members-list',
	22	+ :success => '$("tr-" + element.id).hide(); $(element.id).show();',
	23	+ :complete => '$("members-list").removeClassName("loading")') %>
	24	+
	25	+<br style="clear:both" />
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+<h3> <%= _('Users') %> </h3>
	2	+<table>
	3	+ <tr><th><%= _('Name') %></th><th></th></tr>
	4	+ <% @users_found.each do \|user\| %>
	5	+ <tr id="tr-<%= user.identifier %>"<%= profile.members.include?(user) ? 'style="display:none"' : '' %>>
	6	+ <td>
	7	+ <div id="<%= user.identifier %>" class="draggable-user">
	8	+ <%= image_tag('/images/grip-clue.png') %>
	9	+ <%= profile_image(user, :icon) %>
	10	+ <%= [link_to_profile(user.short_name + " (#{user.identifier})", user.identifier, :title => user.name),
	11	+ (user.sex ? gettext(user.sex.capitalize) : _('Sex not informed')),
	12	+ user.location.empty? ? nil : user.location ].compact.join(' ') %>
	13	+ </div>
	14	+ <%= draggable_element(user.identifier, :revert => true) %>
	15	+ </td>
	16	+ <td>
	17	+ <%= button_to_remote_without_text(:add, _('Add member'),
	18	+ { :loading => '$("members-list").addClassName("loading")',
	19	+ :update => 'members-list',
	20	+ :url => {:action => 'add_member', :profile => profile.identifier, :id => user.identifier},
	21	+ :success => "$('tr-#{user.identifier}').hide()",
	22	+ :complete => '$("members-list").removeClassName("loading")'}) %>
	23	+
	24	+
	25	+ </td>
	26	+ </tr>
	27	+ <% end if @users_found %>
	28	+</table>
1	-<h2> <%= _('Listing Members') %> </h2>
2	-
3	-<%= link_to _('Affiliate yourself'), :action => 'add_role', :person => current_user.person, :role => @member_role if @member_role %>
4	-
5	-<table>
6	- <tr>
7	- <th><%= _('Member') %></th>
8	- <th><%= _('Actions') %></th>
9	- </tr>
10	- <% @members.each do \|m\| %>
11	- <tr>
12	- <td><%= m.name %> </td>
13	- <td>
14	- <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
15	- <%= button_without_text :delete, _('Remove'), :action => 'unassociate', :id => m %>
16	- </td>
17	- </tr>
18	- <% end %>
19	-</table>	1	+<div id="members-list">
		2	+ <%= render :partial => 'members_list' %>
		3	+</div>
20		4
21	<% button_bar do %>	5	<% button_bar do %>
22	<%= button :back, _('Back'), :controller => 'profile_editor' %>	6	<%= button :back, _('Back'), :controller => 'profile_editor' %>
		7	+ <%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>
23	<% end %>	8	<% end %>
@@ -0,0 +1,54 @@		@@ -0,0 +1,54 @@
	1	+.no-boxes {
	2	+ margin: 30px
	3	+}
	4	+
	5	+#users-list {
	6	+ float: left;
	7	+ width: 60%;
	8	+}
	9	+
	10	+.msie6 #users-list {
	11	+ position: relative;
	12	+}
	13	+
	14	+#users-list a.icon-add{
	15	+ float: right;
	16	+}
	17	+
	18	+.msie #users-list a.icon-add{
	19	+ display: block;
	20	+}
	21	+
	22	+.draggable-user {
	23	+ xwidth: 170px;
	24	+ cursor: move;
	25	+}
	26	+
	27	+#members-list.add-members {
	28	+ float: right;
	29	+ width: 30%;
	30	+ text-align: center;
	31	+}
	32	+
	33	+.members-buttons-cell {
	34	+ width: 60px;
	35	+}
	36	+
	37	+.msie .members-buttons-cell a {
	38	+ position: relative;
	39	+ display: block;
	40	+ float: left;
	41	+}
	42	+
	43	+.msie6 .button-bar a {
	44	+ position: relative;
	45	+}
	46	+
	47	+.loading {
	48	+ cursor: progress;
	49	+ background: transparent url(../images/loading.gif) no-repeat scroll center 50px;
	50	+}
	51	+
	52	+table {
	53	+ text-align: left;
	54	+}
	@@ -90,8 +90,8 @@ class ProfileMembersControllerTest < Test::Unit::TestCase		@@ -90,8 +90,8 @@ class ProfileMembersControllerTest < Test::Unit::TestCase
90	login_as :admin_user	90	login_as :admin_user
91	get :unassociate, :profile => com.identifier, :id => member	91	get :unassociate, :profile => com.identifier, :id => member
92		92
93	- assert_response :redirect
94	- assert_redirected_to :action => 'index'	93	+ assert_response :success
		94	+ assert_equal nil, @response.layout
95	member.reload	95	member.reload
96	com.reload	96	com.reload
97	assert_not_includes com.members, member	97	assert_not_includes com.members, member
	@@ -112,4 +112,100 @@ class ProfileMembersControllerTest < Test::Unit::TestCase		@@ -112,4 +112,100 @@ class ProfileMembersControllerTest < Test::Unit::TestCase
112	assert_not_includes assigns(:roles), role	112	assert_not_includes assigns(:roles), role
113	end	113	end
114		114
		115	+ should 'enterprises have a add members button' do
		116	+ ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
		117	+ u = create_user_with_permission('test_user', 'manage_memberships', ent)
		118	+ login_as :test_user
		119	+
		120	+ get :index, :profile => ent.identifier
		121	+ assert_tag :tag => 'a', :attributes => {:href => /add_members/}
		122	+ end
		123	+
		124	+ should 'not display add members button for communities' do
		125	+ com = Community.create!(:name => 'Test Com', :identifier => 'test_com')
		126	+ u = create_user_with_permission('test_user', 'manage_memberships', com)
		127	+ login_as :test_user
		128	+
		129	+ get :index, :profile => com.identifier
		130	+ assert_no_tag :tag => 'a', :attributes => {:href => /add_members/}
		131	+ end
		132	+
		133	+ should 'have a add_members page' do
		134	+ ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
		135	+ u = create_user_with_permission('test_user', 'manage_memberships', ent)
		136	+ login_as :test_user
		137	+
		138	+ assert_nothing_raised do
		139	+ get :add_members, :profile => ent.identifier
		140	+ end
		141	+
		142	+ end
		143	+
		144	+ should 'list current members when adding new members' do
		145	+ ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
		146	+ p = create_user_with_permission('test_user', 'manage_memberships', ent)
		147	+ login_as :test_user
		148	+
		149	+ get :add_members, :profile => ent.identifier
		150	+ ent.reload
		151	+ assert_includes ent.members, p
		152	+ end
		153	+
		154	+ should 'add member to profile' do
		155	+ ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
		156	+ p = create_user_with_permission('test_user', 'manage_memberships', ent)
		157	+ login_as :test_user
		158	+
		159	+ u = create_user('member_wannabe').person
		160	+ post :add_member, :profile => ent.identifier, :id => u.identifier
		161	+ ent.reload
		162	+
		163	+ assert_includes ent.members, p
		164	+ assert_includes ent.members, u
		165	+ end
		166	+
		167	+ should 'add member with all roles' do
		168	+ ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
		169	+ p = create_user_with_permission('test_user', 'manage_memberships', ent)
		170	+ login_as :test_user
		171	+
		172	+ u = create_user('member_wannabe').person
		173	+ post :add_member, :profile => ent.identifier, :id => u.identifier
		174	+
		175	+ assert_equivalent Profile::Roles.all_roles(ent.environment).compact, u.role_assignments.find_all_by_resource_id(ent.id).map(&:role).compact
		176	+ end
		177	+
		178	+ should 'not add member to community' do
		179	+ com = Community.create!(:name => 'Test Com', :identifier => 'test_com')
		180	+ p = create_user_with_permission('test_user', 'manage_memberships', com)
		181	+ login_as :test_user
		182	+
		183	+ u = create_user('member_wannabe').person
		184	+ post :add_member, :profile => com.identifier, :id => u.identifier
		185	+ com.reload
		186	+
		187	+ assert_not_includes com.members, u
		188	+ end
		189	+
		190	+ should 'find users' do
		191	+ ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
		192	+ user = create_user('test_user').person
		193	+ u = create_user_with_permission('ent_user', 'manage_memberships', ent)
		194	+ login_as :ent_user
		195	+
		196	+ get :find_users, :profile => ent.identifier, :query => 'test*'
		197	+
		198	+ assert_includes assigns(:users_found), user
		199	+ end
		200	+
		201	+ should 'not appear add button for member in add members page' do
		202	+ ent = Enterprise.create!(:name => 'Test Ent', :identifier => 'test_ent')
		203	+ p = create_user_with_permission('test_user', 'manage_memberships', ent)
		204	+ login_as :test_user
		205	+
		206	+ get :find_users, :profile => ent.identifier, :query => 'test*'
		207	+
		208	+ assert_tag :tag => 'tr', :attributes => {:id => 'tr-test_user', :style => 'display:none'}
		209	+ end
		210	+
115	end	211	end