Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More code cleanup in get_day_list() with help from Kees Bakker.

Browse Source 
svn: r12051
This commit is contained in:
Rob G. Healey
2009-02-20 02:21:46 +00:00
parent 66753f3d3b
commit dbb777d411
1 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/webreport/WebCal.py
View File

@@ -1435,29 +1435,29 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
# initialize day_list # initialize day_list
day_list = [] day_list = []
##################################################################
# holiday on this day # holiday on this day
if holiday_list > []: # The 0 will force holidays to be first in the list
# will force holidays to be first in the list
nyears = 0
for event_name in holiday_list: for event_name in holiday_list:
for line in event_name.splitlines(): for line in event_name.splitlines():
day_list.append((nyears, event_date, line, 'Holiday')) day_list.append((0, event_date, line, 'Holiday'))
##################################################################
##################################################################
# birthday/ anniversary on this day # birthday/ anniversary on this day
if bday_anniv_list > []: # '...' signifies an incomplete date for an event. See add_day_item()
birth_anniversary = [(t, e, d) for t, e, d in bday_anniv_list if d.is_valid()] bday_anniv_list = [(t, e, d) for t, e, d in bday_anniv_list
for text, event, date in birth_anniversary: if d != '...']
txt_str = None # number of years have to be at least zero
bday_anniv_list = [(t, e, d) for t, e, d in bday_anniv_list
if (event_date.get_year() - d.get_year()) >= 0]
for text, event, date in bday_anniv_list:
# number of years married, ex: 10 # number of years married, ex: 10
nyears = event_date.get_year() - date.get_year() nyears = event_date.get_year() - date.get_year()
# no negative years txt_str = None
# years have to be at least zero
if nyears > -1:
# number of years for birthday, ex: 10 years # number of years for birthday, ex: 10 years
age_str = event_date - date age_str = event_date - date