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

[fix] [minor] get events

Browse source
This commit is contained in:
Anand Doshi 2013-08-12 19:51:39 +05:30
parent 441b33dd05
commit 82fdc98091
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/doctype/event/event.py
View file

@ -49,12 +49,12 @@ def get_events(start, end, user=None, for_reminder=False):
starts_on, ends_on, owner, all_day, event_type, repeat_this_event, repeat_on,
monday, tuesday, wednesday, thursday, friday, saturday, sunday
from tabEvent where ((
(starts_on between '%(start)s 00:00:00' and '%(end)s 23:59:59')
or (ends_on between '%(start)s 00:00:00' and '%(end)s 23:59:59')
or (starts_on <= '%(start)s' and ends_on >= '%(end)s')
(date(starts_on) between date('%(start)s') and date('%(end)s'))
or (date(ends_on) between date('%(start)s') and date('%(end)s'))
or (date(starts_on) <= date('%(start)s') and date(ends_on) >= date('%(end)s'))
) or (
starts_on <= '%(start)s 00:00:00' and ifnull(repeat_this_event,0)=1 and
ifnull(repeat_till, "3000-01-01 00:00:00") > '%(start)s'
date(starts_on) <= date('%(start)s') and ifnull(repeat_this_event,0)=1 and
ifnull(repeat_till, "3000-01-01") > date('%(start)s')
))
%(reminder_condition)s
and (event_type='Public' or owner='%(user)s'
@ -93,7 +93,7 @@ def get_events(start, end, user=None, for_reminder=False):
# repeat for all years in period
for year in range(start_year, end_year+1):
date = str(year) + "-" + event_start
if date > start and date < end:
if date >= start and date <= end:
add_event(e, date)
events.remove(e)