From 153253c40367f6897b2b3bc06b28ed466677e87b Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Tue, 15 Nov 2016 12:22:44 -0800 Subject: [PATCH 1/5] UI-1309: Add Google Maps Geocode API endpoint and request handler --- submodules/myOffice/myOffice.js | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index 51de51b..aa2f84c 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -6,7 +6,19 @@ define(function(require){ var app = { - requests: {}, + requests: { + 'google.geocode.address': { + apiRoot: '//maps.googleapis.com/', + url: 'maps/api/geocode/json?address={zipCode}', + verb: 'GET', + generateError: false, + removeHeaders: [ + 'X-Kazoo-Cluster-ID', + 'X-Auth-Token', + 'Content-Type' + ] + } + }, subscribe: { 'voip.myOffice.render': 'myOfficeRender', @@ -1141,6 +1153,21 @@ define(function(require){ callback && callback(savedUser.data); } }); + }, + + myOfficeGetAddessFromZipCode: function(args) { + var self = this; + + monster.request({ + resource: 'google.geocode.address', + data: args.data, + success: function(data, status) { + args.hasOwnProperty('success') && args.success(data.results); + }, + error: function(errorPayload, data, globalHandler) { + args.hasOwnProperty('error') ? args.error() : globalHandler(data, { generateError: true }); + } + }); } }; From 2c5f8aafbee5df46e6258bf493e9822f1e435125 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Tue, 15 Nov 2016 12:23:28 -0800 Subject: [PATCH 2/5] UI-1309: Use Google Maps Geocode API instead of geocode.org API to resolve ZIP codes into addresses --- submodules/myOffice/myOffice.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index aa2f84c..c231c41 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -920,10 +920,15 @@ define(function(require){ }); emergencyZipcodeInput.on('blur', function() { - $.getJSON('http://www.geonames.org/postalCodeLookupJSON?&country=US&callback=?', { postalcode: $(this).val() }, function(response) { - if (response && response.postalcodes.length && response.postalcodes[0].placeName) { - emergencyCityInput.val(response.postalcodes[0].placeName); - emergencyStateInput.val(response.postalcodes[0].adminName1); + self.myOfficeGetAddessFromZipCode({ + data: { + zipCode: $(this).val() + }, + success: function(results) { + if (!_.isEmpty(results)) { + emergencyCityInput.val(results[0].address_components[1].long_name); + emergencyStateInput.val(results[0].address_components[3].short_name); + } } }); }); From d3040d76ca3292e2a79d533f6dc5df98a6a3f7f2 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Tue, 15 Nov 2016 12:24:29 -0800 Subject: [PATCH 3/5] UI-1309: Trigger Google Maps Geocoding API request on change instead of blur event --- submodules/myOffice/myOffice.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index c231c41..5e4b209 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -920,17 +920,21 @@ define(function(require){ }); emergencyZipcodeInput.on('blur', function() { - self.myOfficeGetAddessFromZipCode({ - data: { - zipCode: $(this).val() - }, - success: function(results) { - if (!_.isEmpty(results)) { - emergencyCityInput.val(results[0].address_components[1].long_name); - emergencyStateInput.val(results[0].address_components[3].short_name); + var zipCode = $(this).val(); + + if (zipCode) { + self.myOfficeGetAddessFromZipCode({ + data: { + zipCode: zipCode + }, + success: function(results) { + if (!_.isEmpty(results)) { + emergencyCityInput.val(results[0].address_components[1].long_name); + emergencyStateInput.val(results[0].address_components[3].short_name); + } } - } - }); + }); + } }); popupTemplate.find('.save').on('click', function() { From c44cf85fe955ee7d54f37ad5cc421cae2aeda4c8 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Wed, 23 Nov 2016 11:34:49 -0800 Subject: [PATCH 4/5] UI-2476: Disable button once it's clicked --- submodules/users/users.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/submodules/users/users.js b/submodules/users/users.js index cd82349..a2191b8 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -650,6 +650,9 @@ define(function(require){ var dataForm = monster.ui.getFormData('form_user_creation'), formattedData = self.usersFormatCreationData(dataForm); + $(this) + .prop({ disabled: 'true' }); + self.usersCreate(formattedData, function(data) { popup.dialog('close').remove(); From dfecf4796c8feae055748ebac985dfd6fc0c7888 Mon Sep 17 00:00:00 2001 From: Jean-Roch Maitre Date: Thu, 1 Dec 2016 16:02:44 -0800 Subject: [PATCH 5/5] UI-2489: fix mailto link for report error in call logs --- submodules/callLogs/callLogs.js | 2 +- views/callLogs-cdrsList.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/callLogs/callLogs.js b/submodules/callLogs/callLogs.js index 39fcea1..ef1f179 100644 --- a/submodules/callLogs/callLogs.js +++ b/submodules/callLogs/callLogs.js @@ -366,7 +366,7 @@ define(function(require){ + "%0D%0AHangup Cause: " + (cdr.hangup_cause || "") + "%0D%0ACall ID: " + cdr.call_id + "%0D%0AOther Leg Call ID: " + (cdr.other_leg_call_id || "") - + "%0D%0AHandling Server: " + (cdr.handling_server || "") + + "%0D%0AHandling Server: " + (cdr.media_server || "") }; }; diff --git a/views/callLogs-cdrsList.html b/views/callLogs-cdrsList.html index 8c21a4a..c06273f 100644 --- a/views/callLogs-cdrsList.html +++ b/views/callLogs-cdrsList.html @@ -42,7 +42,7 @@
- {{#if ../showReport}}{{/if}} + {{#if ../showReport}}{{/if}}