vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(calendar): adjust for qb changes (#35238)

Browse source 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
Akhil Narang 2025-12-16 12:08:02 +05:30 • committed by GitHub
parent e2dcd6b2db
commit cf312aed17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/desk/calendar.py
View file

@ -5,6 +5,8 @@ import json
import frappe
from frappe import _
from frappe.query_builder import functions
from frappe.query_builder.terms import ValueWrapper
@frappe.whitelist()
@ -46,12 +48,14 @@ def get_events(doctype, start, end, field_map, filters=None, fields=None):
if field_map.color:
fields.append(field_map.color)
start_date = "ifnull({}, '0001-01-01 00:00:00')".format(field_map.start)
end_date = "ifnull({}, '2199-12-31 00:00:00')".format(field_map.end)
dt = frappe.qb.DocType(doctype)
start_field = functions.IfNull(dt[field_map.start], ValueWrapper("0001-01-01 00:00:00"))
end_field = functions.IfNull(dt[field_map.end], ValueWrapper("2199-12-31 00:00:00"))
filters += [
[doctype, start_date, "<=", end],
[doctype, end_date, ">=", start],
[start_field, "<=", end],
[end_field, ">=", start],
]
fields = list({field for field in fields if field})
return frappe.get_list(doctype, fields=fields, filters=filters)