From 3495295211d8e05c6927878bd9a1d8194e080484 Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Tue, 22 Mar 2016 22:45:02 +0100 Subject: [PATCH] Minor modifications to the pull request changes of backend_calendar.js --- src/assets/js/backend_calendar.js | 53 ++++++++++++++----------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/src/assets/js/backend_calendar.js b/src/assets/js/backend_calendar.js index b411898a..77637477 100644 --- a/src/assets/js/backend_calendar.js +++ b/src/assets/js/backend_calendar.js @@ -842,8 +842,6 @@ var BackendCalendar = { // Display modal form. $dialog.find('.modal-header h3').text(EALang['new_appointment_title']); $dialog.modal('show'); - - }); /** @@ -926,51 +924,48 @@ var BackendCalendar = { * Event: Filter Existing Customers "Change" */ $('#filter-existing-customers').keyup(function() { - var key = $(this).val().toLowerCase(); - var $list = $('#existing-customers-list'); + var key = $(this).val().toLowerCase(), + $list = $('#existing-customers-list'), + postUrl = GlobalVariables.baseUrl + '/index.php/backend_api/ajax_filter_customers', + postData = { + 'csrfToken': GlobalVariables.csrfToken, + 'key': key + }; - var postUrl = GlobalVariables.baseUrl + '/index.php/backend_api/ajax_filter_customers'; - var postData = { - 'csrfToken': GlobalVariables.csrfToken, - 'key': key - }; - - // Try to get the updated customer list + // Try to get the updated customer list. $.ajax({ - 'type': 'POST', - 'url': postUrl, - 'data': postData, - 'dataType': 'json', - 'timeout': 1000, - 'global': false, - 'success': function(response) { + type: 'POST', + url: postUrl, + data: postData, + dataType: 'json', + timeout: 1000, + global: false, + success: function(response) { ///////////////////////////////////////////////////////////// - console.log('Filter Customers Appointment Response:', response); + // console.log('Filter Customers Appointment Response:', response); ///////////////////////////////////////////////////////////// $list.empty(); $.each(response, function(index, c) { $list.append('
' - + c.first_name + ' ' + c.last_name + '
'); + + c.first_name + ' ' + c.last_name + ''); - // Verify if this customer is on the old customer list - var result = $.grep(GlobalVariables.customers, - function(e){ return e.id == c.id; }); + // Verify if this customer is on the old customer list. + var result = $.grep(GlobalVariables.customers, + function(e){ return e.id == c.id; }); - // Add it to the customer list + // Add it to the customer list. if(result.length == 0){ GlobalVariables.customers.push(c); } }); }, - 'error': function(jqXHR, textStatus, errorThrown) { + error: function(jqXHR, textStatus, errorThrown) { ////////////////////////////////////////////////////////////////// - console.log('Filter Customers Appointment Error:', jqXHR, textStatus, - errorThrown); + // console.log('Filter Customers Appointment Error:', jqXHR, textStatus, errorThrown); ////////////////////////////////////////////////////////////////// - // If there is any error on the request, search by the local - // client database + // If there is any error on the request, search by the local client database. $list.empty(); $.each(GlobalVariables.customers, function(index, c) { if (c.first_name.toLowerCase().indexOf(key) != -1