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

* src/plugins/WebCal.py: Temp fixes to keep running (bug #1441)

Browse Source 
2007-12-15  Douglas S. Blank  <dblank@cs.brynmawr.edu>


svn: r9509
This commit is contained in:
Doug Blank
2007-12-15 15:49:53 +00:00
parent 19deae4720
commit 95c3645f13
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,3 +1,6 @@
2007-12-15 Douglas S. Blank <dblank@cs.brynmawr.edu>
* src/plugins/WebCal.py: Temp fixes to keep running (bug #1441)
2007-12-15 Douglas S. Blank <dblank@cs.brynmawr.edu> 2007-12-15 Douglas S. Blank <dblank@cs.brynmawr.edu>
* src/DataViews/_RelationView.py: Made suggestion by Stian: * src/DataViews/_RelationView.py: Made suggestion by Stian:
http://www.gramps-project.org/wiki/index.php?title=GEPS_002:_RelationView_Expand_and_Collapse#User_Contributions http://www.gramps-project.org/wiki/index.php?title=GEPS_002:_RelationView_Expand_and_Collapse#User_Contributions

12
src/plugins/WebCal.py
View File

@@ -118,6 +118,14 @@ _cc = [
'<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License - By attribution, Non-commerical, Share-alike" title="Creative Commons License - By attribution, Non-commerical, Share-alike" src="somerights20.gif" /></a>', '<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License - By attribution, Non-commerical, Share-alike" title="Creative Commons License - By attribution, Non-commerical, Share-alike" src="somerights20.gif" /></a>',
] ]
def make_date(year, month, day):
"""
Returns a Date object of the particular year/month/day.
"""
retval = gen.lib.Date()
retval.set_yr_mon_day(year, month, day)
return retval
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
# WebReport # WebReport
@@ -596,7 +604,7 @@ class WebReport(Report):
if birth_ref: if birth_ref:
birth_event = self.database.get_event_from_handle(birth_ref.ref) birth_event = self.database.get_event_from_handle(birth_ref.ref)
birth_date = birth_event.get_date_object() birth_date = birth_event.get_date_object()
living = probably_alive(person, self.database, self.Year, 0) living = probably_alive(person, self.database, make_date(self.Year, 1, 1), 0)
if self.Birthday and birth_date != None and ((self.Alive and living) or not self.Alive): if self.Birthday and birth_date != None and ((self.Alive and living) or not self.Alive):
year = birth_date.get_year() year = birth_date.get_year()
month = birth_date.get_month() month = birth_date.get_month()
@@ -635,7 +643,7 @@ class WebReport(Report):
spouse_name = self.get_short_name(spouse) spouse_name = self.get_short_name(spouse)
short_name = self.get_short_name(person) short_name = self.get_short_name(person)
if self.Alive: if self.Alive:
if not probably_alive(spouse, self.database, self.Year, 0): if not probably_alive(spouse, self.database, make_date(self.Year, 1, 1), 0):
continue continue
married = True married = True
for event_ref in fam.get_event_ref_list(): for event_ref in fam.get_event_ref_list():