Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: removed all day event from shift assignment calendar (#24397)

Browse Source 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
This commit is contained in:
Anurag Mishra 2021-01-28 12:24:39 +05:30 committed by GitHub
parent e5529ad461
commit 5756bf50e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
erpnext/hr/doctype/shift_assignment/shift_assignment.py
View File

@ -88,7 +88,7 @@ def get_events(start, end, filters=None):
def add_assignments(events, start, end, conditions=None): def add_assignments(events, start, end, conditions=None):
query = """select name, start_date, end_date, employee_name, query = """select name, start_date, end_date, employee_name,
employee, docstatus employee, docstatus, shift_type
from `tabShift Assignment` where from `tabShift Assignment` where
start_date >= %(start_date)s start_date >= %(start_date)s
or end_date <= %(end_date)s or end_date <= %(end_date)s
@ -97,18 +97,40 @@ def add_assignments(events, start, end, conditions=None):
if conditions: if conditions:
query += conditions query += conditions
for d in frappe.db.sql(query, {"start_date":start, "end_date":end}, as_dict=True): records = frappe.db.sql(query, {"start_date":start, "end_date":end}, as_dict=True)
e = { shift_timing_map = get_shift_type_timing([d.shift_type for d in records])
"name": d.name,
"doctype": "Shift Assignment", for d in records:
"start_date": d.start_date, daily_event_start = d.start_date
"end_date": d.end_date if d.end_date else nowdate(), daily_event_end = d.end_date if d.end_date else getdate()
"title": cstr(d.employee_name) + ": "+ \ delta = timedelta(days=1)
cstr(d.shift_type), while daily_event_start <= daily_event_end:
"docstatus": d.docstatus start_timing = frappe.utils.get_datetime(daily_event_start)+ shift_timing_map[d.shift_type]['start_time']
} end_timing = frappe.utils.get_datetime(daily_event_start)+ shift_timing_map[d.shift_type]['end_time']
if e not in events: daily_event_start += delta
events.append(e) e = {
"name": d.name,
"doctype": "Shift Assignment",
"start_date": start_timing,
"end_date": end_timing,
"title": cstr(d.employee_name) + ": "+ \
cstr(d.shift_type),
"docstatus": d.docstatus,
"allDay": 0
}
if e not in events:
events.append(e)
return events
def get_shift_type_timing(shift_types):
shift_timing_map = {}
data = frappe.get_all("Shift Type", filters = {"name": ("IN", shift_types)}, fields = ['name', 'start_time', 'end_time'])
for d in data:
shift_timing_map[d.name] = d
return shift_timing_map
def get_employee_shift(employee, for_date=nowdate(), consider_default_shift=False, next_shift_direction=None): def get_employee_shift(employee, for_date=nowdate(), consider_default_shift=False, next_shift_direction=None):

10
erpnext/hr/doctype/shift_assignment/shift_assignment_calendar.js
View File

@ -6,14 +6,8 @@ frappe.views.calendar["Shift Assignment"] = {
"start": "start_date", "start": "start_date",
"end": "end_date", "end": "end_date",
"id": "name", "id": "name",
"docstatus": 1 "docstatus": 1,
}, "allDay": "allDay",
options: {
header: {
left: 'prev,next today',
center: 'title',
right: 'month'
}
}, },
get_events_method: "erpnext.hr.doctype.shift_assignment.shift_assignment.get_events" get_events_method: "erpnext.hr.doctype.shift_assignment.shift_assignment.get_events"
} }