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

2007-10-07 Douglas Blank <dblank@cs.brynmawr.edu>

Browse Source 
* src/plugins/Calendar.py: various improvements, issue #1157



svn: r9098
This commit is contained in:
Benny Malengier
2007-10-07 20:39:39 +00:00
parent 082a35185d
commit ebffeeb59d
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,3 +1,6 @@
2007-10-07 Douglas Blank <dblank@cs.brynmawr.edu>
* src/plugins/Calendar.py: various improvements, issue #1157
2007-10-07 Gary Burton <gary.burton@zen.co.uk> 2007-10-07 Gary Burton <gary.burton@zen.co.uk>
* src/DataViews/_RelationView.py: init scroll pos on new person, issue #442 * src/DataViews/_RelationView.py: init scroll pos on new person, issue #442

23
src/plugins/Calendar.py
View File

@@ -309,7 +309,8 @@ class Calendar(Report):
if father != None: if father != None:
father_lastname = father.get_primary_name().get_surname() father_lastname = father.get_primary_name().get_surname()
short_name = self.get_short_name(person, father_lastname) short_name = self.get_short_name(person, father_lastname)
self.add_day_item("%s, %d" % (short_name, age), year, month, day) if age >= 0:
self.add_day_item("%s, %d" % (short_name, age), year, month, day)
if self["anniversaries"] and ((self["alive"] and alive) or not self["alive"]): if self["anniversaries"] and ((self["alive"] and alive) or not self["alive"]):
family_list = person.get_family_handle_list() family_list = person.get_family_handle_list()
for fhandle in family_list: for fhandle in family_list:
@@ -328,19 +329,27 @@ class Calendar(Report):
if self["alive"]: if self["alive"]:
if not probably_alive(spouse, self.database, self["year"]): if not probably_alive(spouse, self.database, self["year"]):
continue continue
are_married = None
for event_ref in fam.get_event_ref_list(): for event_ref in fam.get_event_ref_list():
event = self.database.get_event_from_handle(event_ref.ref) event = self.database.get_event_from_handle(event_ref.ref)
if int(event.get_type()) in [RelLib.EventType.MARRIAGE, RelLib.EventType.MARR_ALT]:
are_married = event
elif int(event.get_type()) in [RelLib.EventType.DIVORCE, RelLib.EventType.ANNULMENT]:
are_married = None
if are_married != None:
event = are_married
event_obj = event.get_date_object() event_obj = event.get_date_object()
year = event_obj.get_year() year = event_obj.get_year()
month = event_obj.get_month() month = event_obj.get_month()
day = event_obj.get_day() day = event_obj.get_day()
years = self["year"] - year years = self["year"] - year
text = _("%(spouse)s and\n %(person)s, %(nyears)d") % { if years >= 0:
'spouse' : spouse_name, text = _("%(spouse)s and\n %(person)s, %(nyears)d") % {
'person' : short_name, 'spouse' : spouse_name,
'nyears' : years, 'person' : short_name,
} 'nyears' : years,
self.add_day_item(text, year, month, day) }
self.add_day_item(text, year, month, day)
class CalendarReport(Calendar): class CalendarReport(Calendar):
def write_report(self): def write_report(self):