Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fetch shift details and save for all shift types #2709

Merged
merged 3 commits into from
Jan 27, 2025
Merged

fix: Fetch shift details and save for all shift types #2709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3871947
fix: fetch shift even if previous shift is not the same as current shift
asmitahase Jan 27, 2025
2106636
chore: test bulk fetch shift if shift settings change for the same shift
asmitahase Jan 27, 2025
3464c56
Merge branch 'develop' into fetch-shift
asmitahase Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions hrms/hr/doctype/employee_checkin/employee_checkin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ frappe.ui.form.on("Employee Checkin", {
add_fetch_shift_button(frm) {
if (frm.doc.attendace) return;
frm.add_custom_button(__("Fetch Shift"), function () {
const previous_shift = frm.doc.shift;
frappe.call({
method: "fetch_shift",
doc: frm.doc,
freeze: true,
freeze_message: __("Fetching Shift"),
callback: function () {
if (previous_shift === frm.doc.shift) return;
frm.dirty();
frm.save();
frappe.show_alert({
Expand Down
28 changes: 28 additions & 0 deletions hrms/hr/doctype/employee_checkin/test_employee_checkin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,34 @@ def test_bulk_fetch_shift(self):
# shift does not change since attendance is already marked
self.assertEqual(log2.shift, shift1.name)

def test_bulk_fetch_shift_if_shift_settings_change_for_the_same_shift(self):
emp1 = make_employee("[email protected]", company="_Test Company")
emp2 = make_employee("[email protected]", company="_Test Company")

# 8 - 12,
shift = setup_shift_type(shift_type="Test Bulk Shift")
date = getdate()
make_shift_assignment(shift.name, emp1, date)
make_shift_assignment(shift.name, emp2, date)

timestamp = datetime.combine(date, get_time("08:00:00"))
# shift actual start is `current date 07:00:00`
log1 = make_checkin(emp1, timestamp)
self.assertEqual(log1.shift_actual_start, datetime.combine(date, get_time("07:00:00")))
log2 = make_checkin(emp2, timestamp)
self.assertEqual(log2.shift_actual_start, datetime.combine(date, get_time("07:00:00")))

# change shift settings like check in buffer from 60 minutes to 120 minutes
# so now shift actual start is `current date 06:00:00`
shift.begin_check_in_before_shift_start_time = 120
shift.save()
bulk_fetch_shift([log1.name, log2.name])
# shift changes according to the new assignment
log1.reload()
self.assertEqual(log1.shift_actual_start, datetime.combine(date, get_time("06:00:00")))
log2.reload()
self.assertEqual(log2.shift_actual_start, datetime.combine(date, get_time("06:00:00")))


def make_n_checkins(employee, n, hours_to_reverse=1):
logs = [make_checkin(employee, now_datetime() - timedelta(hours=hours_to_reverse, minutes=n + 1))]
Expand Down
Loading