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

feat: only show open events

Browse source
This commit is contained in:
Himanshu Warekar 2019-07-27 15:42:45 +05:30
parent 0ce42718f4
commit 5f59fc21db
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/desk/doctype/event/event.py
View file

@ -28,7 +28,7 @@ class Event(Document):
if self.starts_on and self.ends_on:
self.validate_from_to_dates("starts_on", "ends_on")
if self.repeat_on == "Daily" and getdate(self.starts_on) != getdate(self.ends_on):
if self.repeat_on == "Daily" and self.ends_on and getdate(self.starts_on) != getdate(self.ends_on):
frappe.throw(_("Daily Events should finish on the Same Day."))
def on_update(self):
@ -194,6 +194,7 @@ def get_events(start, end, user=None, for_reminder=False, filters=None):
AND `tabDocShare`.user=%(user)s
)
)
AND `tabEvent`.status='Open'
ORDER BY `tabEvent`.starts_on""".format(
filter_condition=get_filters_cond('Event', filters, []),
reminder_condition="AND coalesce(`tabEvent`.send_reminder, 0)=1" if for_reminder else ""