Commit e2fd0fe2 by Damien Moulard

Merge branch '2462-enter-to-search-associate' into 'dev_cooperatic'

2462 enter to search associate

See merge request !143
parents e2089d28 f58c3d6b
Pipeline #1930 passed with stage
in 1 minute 30 seconds
...@@ -581,8 +581,7 @@ $('#add_binome').click(function() { ...@@ -581,8 +581,7 @@ $('#add_binome').click(function() {
delete current_coop.is_associated_people; delete current_coop.is_associated_people;
delete current_coop.shift_template; delete current_coop.shift_template;
} }
} } else {
else {
$('#associate_area').show(); $('#associate_area').show();
$('.member_choice').removeClass('choice_active'); $('.member_choice').removeClass('choice_active');
$('#existing_member_choice_action').hide(); $('#existing_member_choice_action').hide();
...@@ -607,6 +606,12 @@ $('.member_choice').on('click', function() { ...@@ -607,6 +606,12 @@ $('.member_choice').on('click', function() {
}); });
$('#shift_calendar').click(show_shift_calendar); $('#shift_calendar').click(show_shift_calendar);
$('#search_member_input').keypress((event) => {
if (event.keyCode==13) {
event.preventDefault();
searchMembersForAssociate();
}
});
//get_latest_odoo_coop_bb(); //get_latest_odoo_coop_bb();
update_self_records(); update_self_records();
...@@ -681,10 +686,10 @@ function display_possible_members() { ...@@ -681,10 +686,10 @@ function display_possible_members() {
} }
$(document).ready(function() { /**
retrieve_and_draw_shift_tempates(); * Search for members to associate a new member with an old one.
// Set action to search for the member */
$('#search_member_button').on('click', function() { function searchMembersForAssociate() {
let search_str = $('#search_member_input').val(); let search_str = $('#search_member_input').val();
if (search_str) { if (search_str) {
...@@ -715,11 +720,18 @@ $(document).ready(function() { ...@@ -715,11 +720,18 @@ $(document).ready(function() {
}); });
} }
}); });
} } else {
else {
members_search_results = []; members_search_results = [];
display_possible_members(); display_possible_members();
} }
}
$(document).ready(function() {
retrieve_and_draw_shift_tempates();
// Set action to search for the member
$('#search_member_button').on('click', function() {
searchMembersForAssociate();
}); });
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment