diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index 545d8b45f5..5f2acd3929 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -522,7 +522,7 @@ frappe.ui.form.Timeline = class Timeline { let energy_point_logs = this.frm.get_docinfo().energy_point_logs; energy_point_logs.map(log => { log.comment_type = 'Energy Points'; - log.content = frappe.energy_points.format_log(log); + log.content = frappe.energy_points.format_form_log(log); return log; }); return energy_point_logs; diff --git a/frappe/public/js/frappe/misc/energy_point_utils.js b/frappe/public/js/frappe/misc/energy_point_utils.js index cdee77a2ed..d9a64a41d8 100644 --- a/frappe/public/js/frappe/misc/energy_point_utils.js +++ b/frappe/public/js/frappe/misc/energy_point_utils.js @@ -9,23 +9,55 @@ Object.assign(frappe.energy_points, { ${points > 0 ? '+': ''}${points} `; }, - log_message(log) { - const doc_link = frappe.utils.get_form_link(log.reference_doctype, log.reference_name, true); - const owner_name = frappe.user.full_name(log.owner).bold(); - const user = frappe.user.full_name(log.user).bold(); - if (log.type === 'Appreciation') { - return __('{0} appreciated {1} on {2}', [owner_name, user, doc_link]); - } - if (log.type === 'Criticism') { - return __('{0} criticized {1} on {2}', [owner_name, user, doc_link]); - } - return __('for {0} via automatic rule {1} on {2}', [user, log.rule.bold(), doc_link]); - }, - format_log(log, with_timestamp=false) { - let formatted_log = ` - ${this.get_points(log.points)} ${this.log_message(log)} - ${ with_timestamp ? ' - ' + frappe.datetime.comment_when(log.creation):''} + format_form_log(log) { + const separator = ` - `; + const formatted_log = ` + ${this.get_points(log.points)}  + ${this.get_form_log_message(log)} + ${log.reason ? separator + log.reason: ''} `; return formatted_log; }, + format_history_log(log) { + // redundant code to honor readability and to avoid confusion + const separator = ` - `; + const formatted_log = ` + ${this.get_points(log.points)}  + ${this.get_history_log_message(log)} + ${log.reason ? separator + log.reason: ''} + ${separator + frappe.datetime.comment_when(log.creation)} + `; + return formatted_log; + }, + get_history_log_message(log) { + const doc_link = frappe.utils.get_form_link(log.reference_doctype, log.reference_name, true); + const owner_name = frappe.user.full_name(log.owner).bold(); + if (log.type === 'Appreciation') { + return __('{0} appreciated on {1}', [owner_name, doc_link]); + } + if (log.type === 'Criticism') { + return __('{0} criticized on {1}', [owner_name, doc_link]); + } + if (log.type === 'Revert') { + return __('{0} reverted {1}', [owner_name, + frappe.utils.get_form_link('Energy Point Log', log.revert_for, true)]); + } + return __('via automatic rule {0} on {1}', [log.rule.bold(), doc_link]); + }, + get_form_log_message(log) { + // redundant code to honor readability and to avoid confusion + const owner_name = frappe.user.full_name(log.owner).bold(); + const user = frappe.user.full_name(log.user).bold(); + if (log.type === 'Appreciation') { + return __('{0} appreciated {1}', [owner_name, user]); + } + if (log.type === 'Criticism') { + return __('{0} criticized {1}', [owner_name, user]); + } + if (log.type === 'Revert') { + return __('{0} reverted {1}', [user, + frappe.utils.get_form_link('Energy Point Log', log.revert_for, true)]); + } + return __('gained by {0} via automatic rule {1}', [user, log.rule.bold()]); + }, }); \ No newline at end of file diff --git a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue index aae03b6b09..e7274f548f 100644 --- a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue +++ b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue @@ -2,7 +2,7 @@