From 476e81a6312f9d38ae8b525b52f47317cbceefe5 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Mon, 6 Dec 2021 18:55:30 +0530
Subject: [PATCH] fix: time to respond & resolve indicators

---
 .../rename_ongoing_status_in_sla_documents.py     |  4 ++--
 erpnext/public/js/utils.js                        | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/erpnext/patches/v14_0/rename_ongoing_status_in_sla_documents.py b/erpnext/patches/v14_0/rename_ongoing_status_in_sla_documents.py
index b5296fbdb0..1cc5f38f42 100644
--- a/erpnext/patches/v14_0/rename_ongoing_status_in_sla_documents.py
+++ b/erpnext/patches/v14_0/rename_ongoing_status_in_sla_documents.py
@@ -12,7 +12,7 @@ def execute():
 			).set(
 				doctype.agreement_status, 'First Response Due'
 			).where(
-				(doctype.first_responded_on.isnull()) | (doctype.first_responded_on == '')
+				doctype.first_responded_on.isnull()
 			).run()
 
 			frappe.qb.update(
@@ -24,4 +24,4 @@ def execute():
 			).run()
 
 		except Exception:
-			frappe.log_error('Failed to Patch SLA Status')
\ No newline at end of file
+			frappe.log_error(title='Failed to Patch SLA Status')
\ No newline at end of file
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index f0facdd3a1..2d8b1be93f 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -831,7 +831,7 @@ $(document).on('app_ready', function() {
 
 					refresh: function(frm) {
 						if (frm.doc.status !== 'Closed' && frm.doc.service_level_agreement
-							&& frm.doc.agreement_status === 'Ongoing') {
+							&& ['First Response Due', 'Resolution Due'].includes(frm.doc.agreement_status)) {
 							frappe.call({
 								'method': 'frappe.client.get',
 								args: {
@@ -884,8 +884,8 @@ $(document).on('app_ready', function() {
 function set_time_to_resolve_and_response(frm, apply_sla_for_resolution) {
 	frm.dashboard.clear_headline();
 
-	let time_to_respond = get_status(frm.doc.response_by_variance);
-	if (!frm.doc.first_responded_on && frm.doc.agreement_status === 'Ongoing') {
+	let time_to_respond = get_status(frm.doc.response_by);
+	if (!frm.doc.first_responded_on) {
 		time_to_respond = get_time_left(frm.doc.response_by, frm.doc.agreement_status);
 	}
 
@@ -899,8 +899,8 @@ function set_time_to_resolve_and_response(frm, apply_sla_for_resolution) {
 
 
 	if (apply_sla_for_resolution) {
-		let time_to_resolve = get_status(frm.doc.resolution_by_variance);
-		if (!frm.doc.resolution_date && frm.doc.agreement_status === 'Ongoing') {
+		let time_to_resolve = get_status(frm.doc.resolution_by);
+		if (!frm.doc.resolution_date) {
 			time_to_resolve = get_time_left(frm.doc.resolution_by, frm.doc.agreement_status);
 		}
 
@@ -924,8 +924,9 @@ function get_time_left(timestamp, agreement_status) {
 	return {'diff_display': diff_display, 'indicator': indicator};
 }
 
-function get_status(variance) {
-	if (variance > 0) {
+function get_status(timestamp) {
+	const time_left = moment(timestamp).diff(moment());
+	if (time_left >= 0) {
 		return {'diff_display': 'Fulfilled', 'indicator': 'green'};
 	} else {
 		return {'diff_display': 'Failed', 'indicator': 'red'};