2007-11-10 Gary Burton <gary.burton@zen.co.uk>

* src/plugins/IndivComplete.py: added support for printing
	non-primary, non-family events.



svn: r9327
This commit is contained in:
Gary Burton 2007-11-10 23:22:17 +00:00
parent 5c2e433ff3
commit b6a5f46caa
2 changed files with 15 additions and 7 deletions

View File

@ -1,3 +1,7 @@
2007-11-10 Gary Burton <gary.burton@zen.co.uk>
* src/plugins/IndivComplete.py: added support for printing
non-primary, non-family events.
2007-11-07 Jim Sack <jgsack@san.rr.com>
* src/ArgHandler.py: typos in cl_export at L562,3 bug #1353
triggered by exporting gedcom

View File

@ -114,11 +114,17 @@ class IndivCompleteReport(Report):
cell.set_longlist(1)
self.doc.add_cell_style("IDS-ListCell",cell)
def write_fact(self,event):
def write_fact(self,event_ref):
event = self.database.get_event_from_handle(event_ref.ref)
if event == None:
return
text = ""
name = str(event.get_type())
if event_ref.get_role() == RelLib.EventRoleType.PRIMARY or \
event_ref.get_role() == RelLib.EventRoleType.FAMILY:
name = str(event.get_type())
else:
name = '%(event)s (%(role)s)' % {'event' : str(event.get_type()),
'role' : event_ref.get_role()}
date = DateHandler.get_date(event)
place_handle = event.get_place_handle()
@ -345,8 +351,7 @@ class IndivCompleteReport(Report):
for event_ref in family.get_event_ref_list():
if event_ref:
event = self.database.get_event_from_handle(event_ref.ref)
self.write_fact(event)
self.write_fact(event_ref)
child_ref_list = family.get_child_ref_list()
if len(child_ref_list):
@ -407,11 +412,10 @@ class IndivCompleteReport(Report):
self.doc.end_cell()
self.doc.end_row()
event_ref_list = self.start_person.get_primary_event_ref_list()
event_ref_list = self.start_person.get_event_ref_list()
for event_ref in event_ref_list:
if event_ref:
event = self.database.get_event_from_handle(event_ref.ref)
self.write_fact(event)
self.write_fact(event_ref)
self.doc.end_table()
self.doc.start_paragraph("IDS-Normal")
self.doc.end_paragraph()