nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: time to response shows failed (#28895)

Browse Source
This commit is contained in:
Saqib
2021-12-15 11:45:34 +05:30
committed by GitHub
parent 39c6f661f1
commit 2411477e6d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/public/js/utils.js
View File

@@ -888,9 +888,11 @@ $(document).on('app_ready', function() {
function set_time_to_resolve_and_response(frm, apply_sla_for_resolution) { function set_time_to_resolve_and_response(frm, apply_sla_for_resolution) {
frm.dashboard.clear_headline(); frm.dashboard.clear_headline();
let time_to_respond = get_status(frm.doc.response_by); let time_to_respond;
if (!frm.doc.first_responded_on) { if (!frm.doc.first_responded_on) {
time_to_respond = get_time_left(frm.doc.response_by, frm.doc.agreement_status); time_to_respond = get_time_left(frm.doc.response_by, frm.doc.agreement_status);
} else {
time_to_respond = get_status(frm.doc.response_by, frm.doc.first_responded_on);
} }
let alert = ` let alert = `
@@ -903,9 +905,11 @@ function set_time_to_resolve_and_response(frm, apply_sla_for_resolution) {
if (apply_sla_for_resolution) { if (apply_sla_for_resolution) {
let time_to_resolve = get_status(frm.doc.resolution_by); let time_to_resolve;
if (!frm.doc.resolution_date) { if (!frm.doc.resolution_date) {
time_to_resolve = get_time_left(frm.doc.resolution_by, frm.doc.agreement_status); time_to_resolve = get_time_left(frm.doc.resolution_by, frm.doc.agreement_status);
} else {
time_to_resolve = get_status(frm.doc.resolution_by, frm.doc.resolution_date);
} }
alert += ` alert += `
@@ -928,8 +932,8 @@ function get_time_left(timestamp, agreement_status) {
return {'diff_display': diff_display, 'indicator': indicator}; return {'diff_display': diff_display, 'indicator': indicator};
} }
function get_status(timestamp) { function get_status(expected, actual) {
const time_left = moment(timestamp).diff(moment()); const time_left = moment(expected).diff(moment(actual));
if (time_left >= 0) { if (time_left >= 0) {
return {'diff_display': 'Fulfilled', 'indicator': 'green'}; return {'diff_display': 'Fulfilled', 'indicator': 'green'};
} else { } else {