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

feat(employee): Refactor milestone indicator functions to accept 'today' parameter

Browse Source
This commit is contained in:
Krishna Shirsath
2026-03-12 14:19:15 +05:30
parent e4a0d2ab0b
commit 831b1d3a79
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/setup/doctype/employee/employee.js
View File

@@ -57,23 +57,20 @@ frappe.ui.form.on("Employee", {
frm.trigger("add_anniversary_indicator"); frm.trigger("add_anniversary_indicator");
}, },
is_employee_birthday: function (frm) { is_employee_birthday: function (frm, today) {
if (!frm.doc.date_of_birth) return false; if (!frm.doc.date_of_birth) return false;
let today = moment().startOf("day");
let dob = moment(frm.doc.date_of_birth); let dob = moment(frm.doc.date_of_birth);
return dob.date() === today.date() && dob.month() === today.month(); return dob.date() === today.date() && dob.month() === today.month();
}, },
is_work_anniversary: function (frm) { is_work_anniversary: function (frm, today) {
if (!frm.doc.date_of_joining) return false; if (!frm.doc.date_of_joining) return false;
let today = moment().startOf("day");
let doj = moment(frm.doc.date_of_joining); let doj = moment(frm.doc.date_of_joining);
let years = today.year() - doj.year(); let years = today.year() - doj.year();
return doj.date() === today.date() && doj.month() === today.month() && years > 0; return doj.date() === today.date() && doj.month() === today.month() && years > 0;
}, },
get_work_anniversary_years: function (frm) { get_work_anniversary_years: function (frm, today) {
let today = moment().startOf("day");
let doj = moment(frm.doc.date_of_joining); let doj = moment(frm.doc.date_of_joining);
return today.year() - doj.year(); return today.year() - doj.year();
}, },
@@ -94,8 +91,9 @@ frappe.ui.form.on("Employee", {
}, },
build_anniversary_content: function (frm) { build_anniversary_content: function (frm) {
let today = moment();
let items = []; let items = [];
if (frm.events.is_employee_birthday(frm)) { if (frm.events.is_employee_birthday(frm, today)) {
items.push(` items.push(`
<div class="form-sidebar-items milestone-item mb-2"> <div class="form-sidebar-items milestone-item mb-2">
<span class="form-sidebar-label"> <span class="form-sidebar-label">
@@ -104,8 +102,8 @@ frappe.ui.form.on("Employee", {
</span> </span>
</div>`); </div>`);
} }
if (frm.events.is_work_anniversary(frm)) { if (frm.events.is_work_anniversary(frm, today)) {
let years = frm.events.get_work_anniversary_years(frm); let years = frm.events.get_work_anniversary_years(frm, today);
let label = let label =
years === 1 years === 1
? __("{0} Year Work Anniversary", [years]) ? __("{0} Year Work Anniversary", [years])
@@ -122,7 +120,7 @@ frappe.ui.form.on("Employee", {
}, },
add_anniversary_indicator: function (frm) { add_anniversary_indicator: function (frm) {
if (!frm.sidebar || !frm.sidebar.sidebar) return; if (!frm.sidebar?.sidebar) return;
let $sidebar = frm.sidebar.sidebar; let $sidebar = frm.sidebar.sidebar;
let $indicator_section = frm.events.create_milestone_section($sidebar); let $indicator_section = frm.events.create_milestone_section($sidebar);