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

fix: convert overlap raw query to frappe.qb

Browse Source
This commit is contained in:
Rucha Mahabal 2022-02-17 14:39:17 +05:30
parent e2e998fbd9
commit 3ec9acf8f7
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
erpnext/projects/doctype/timesheet/timesheet.py
View File

@ -171,26 +171,35 @@ class Timesheet(Document):
.format(args.idx, self.name, existing.name), OverlapError) .format(args.idx, self.name, existing.name), OverlapError)
def get_overlap_for(self, fieldname, args, value): def get_overlap_for(self, fieldname, args, value):
cond = "ts.`{0}`".format(fieldname) timesheet = frappe.qb.DocType("Timesheet")
if fieldname == 'workstation': timelog = frappe.qb.DocType("Timesheet Detail")
cond = "tsd.`{0}`".format(fieldname)
existing = frappe.db.sql("""select ts.name as name, tsd.from_time as from_time, tsd.to_time as to_time from from_time = get_datetime(args.from_time)
`tabTimesheet Detail` tsd, `tabTimesheet` ts where {0}=%(val)s and tsd.parent = ts.name and to_time = get_datetime(args.to_time)
(
(%(from_time)s > tsd.from_time and %(from_time)s < tsd.to_time) or query = (
(%(to_time)s > tsd.from_time and %(to_time)s < tsd.to_time) or frappe.qb.from_(timesheet)
(%(from_time)s <= tsd.from_time and %(to_time)s >= tsd.to_time)) .join(timelog)
and tsd.name!=%(name)s .on(timelog.parent == timesheet.name)
and ts.name!=%(parent)s .select(timesheet.name.as_('name'), timelog.from_time.as_('from_time'), timelog.to_time.as_('to_time'))
and ts.docstatus < 2""".format(cond), .where(
{ (timelog.name != (args.name or "No Name"))
"val": value, & (timesheet.name != (args.parent or "No Name"))
"from_time": get_datetime(args.from_time), & (timesheet.docstatus < 2)
"to_time": get_datetime(args.to_time), & (
"name": args.name or "No Name", ((from_time > timelog.from_time) & (from_time < timelog.to_time))
"parent": args.parent or "No Name" | ((to_time > timelog.from_time) & (to_time < timelog.to_time))
}, as_dict=True) | ((from_time <= timelog.from_time) & (to_time >= timelog.to_time))
)
)
)
if fieldname == "workstation":
query = query.where(timelog[fieldname] == value)
else:
query = query.where(timesheet[fieldname] == value)
existing = query.run(as_dict=True)
if self.check_internal_overlap(fieldname, args): if self.check_internal_overlap(fieldname, args):
return self return self
@ -208,11 +217,12 @@ class Timesheet(Document):
args_from_time = get_datetime(args.from_time) args_from_time = get_datetime(args.from_time)
args_to_time = get_datetime(args.to_time) args_to_time = get_datetime(args.to_time)
if (fieldname != 'workstation' or args.get(fieldname) == time_log.get(fieldname)) and \ if ((fieldname != 'workstation' or args.get(fieldname) == time_log.get(fieldname)) and
args.idx != time_log.idx and ( args.idx != time_log.idx and (
(args_from_time > from_time and args_from_time < to_time) (args_from_time > from_time and args_from_time < to_time)
or (args_to_time > from_time and args_to_time < to_time) or (args_to_time > from_time and args_to_time < to_time)
or (args_from_time <= from_time and args_to_time >= to_time) or (args_from_time <= from_time and args_to_time >= to_time)
)
): ):
return True return True
return False return False