From aa0eaab3df03abe958e53a1a351c2a528c042bd9 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Mon, 6 May 2019 01:35:11 +0530 Subject: [PATCH] fix: codacy --- erpnext/support/doctype/issue/issue.js | 5 ++- .../service_level_agreement.js | 15 +++++--- .../service_level_agreement.py | 34 ++++++++++--------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js index d31ae4a4c4..a19b372726 100644 --- a/erpnext/support/doctype/issue/issue.js +++ b/erpnext/support/doctype/issue/issue.js @@ -33,7 +33,7 @@ frappe.ui.form.on("Issue", { frm.call('change_sla_priority', { "priority": frm.doc.priority }).then(() => { - frm.refresh() + frm.refresh(); }); } }, @@ -116,6 +116,5 @@ function get_time_left(timestamp) { if (diff_display == '00:00') { indicator = "red"; } - return {"diff_display": diff_display, - "indicator": indicator}; + return {"diff_display": diff_display, "indicator": indicator}; } diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.js b/erpnext/support/doctype/service_level_agreement/service_level_agreement.js index 2da4b0387d..4f334f212c 100644 --- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.js +++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.js @@ -11,11 +11,16 @@ frappe.ui.form.on('Service Level Agreement', { name: frm.doc.service_level }, callback: function(data){ - for (var i in data.message.priorities){ - frm.add_child("priorities", data.message.priorities[i]); - } - for (var i in data.message.support_and_resolution){ - frm.add_child("support_and_resolution", data.message.support_and_resolution[i]); + let count = Math.max(data.message.priorities.length, data.message.support_and_resolution.length); + let i = 0; + while (i < count){ + if (data.message.priorities[i]) { + frm.add_child("priorities", data.message.priorities[i]); + } + if (data.message.support_and_resolution[i]) { + frm.add_child("support_and_resolution", data.message.support_and_resolution[i]); + } + i++; } frm.refresh(); } diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py index 4fca708993..ea869ee7c8 100644 --- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py +++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py @@ -41,21 +41,23 @@ def check_agreement_status(): @frappe.whitelist() def get_active_service_level_agreement_for(customer, priority): - agreement = frappe.db.sql(""" - select `tabService Level Agreement`.name, `tabService Level Agreement`.service_level, - `tabService Level Agreement`.holiday_list - from `tabService Level Agreement` - inner join `tabService Level Priority` - on `tabService Level Agreement`.name=`tabService Level Priority`.parent where - ( - `tabService Level Agreement`.customer='{0}' and - `tabService Level Agreement`.agreement_status='Active' and - `tabService Level Priority`.priority='{1}' - ) or - ( - `tabService Level Agreement`.default_service_level_agreement='1' - ) - limit 1 - """.format(customer, priority), as_dict=True) + agreement = frappe.db.sql("""select `tabService Level Agreement`.name, `tabService Level Agreement`.service_level, + `tabService Level Agreement`.holiday_list + from `tabService Level Agreement` + inner join `tabService Level Priority` + on `tabService Level Agreement`.name=`tabService Level Priority`.parent where + ( + `tabService Level Agreement`.customer='%(customer)s' and + `tabService Level Agreement`.agreement_status='Active' and + `tabService Level Priority`.priority='%(priority)s' + ) or + ( + `tabService Level Agreement`.default_service_level_agreement='1' + ) + limit 1""", + { + "customer": customer, + "priority": priority + }, as_dict=True) return agreement[0] if agreement else None \ No newline at end of file