From 4d0765cfa6a033694c5d853b404d7d69f6390abf Mon Sep 17 00:00:00 2001 From: Gary Burton Date: Sat, 10 Nov 2007 23:11:03 +0000 Subject: [PATCH] 2007-11-10 Gary Burton * src/plugins/IndivComplete.py: added support for printing non-primary, non-family events. svn: r9326 --- ChangeLog | 4 ++++ src/plugins/IndivComplete.py | 18 +++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4821fe89..c6f8cb329 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-11-10 Gary Burton + * src/plugins/IndivComplete.py: added support for printing non-primary, + non-family events. + 2007-11-10 Benny Malengier * src/plugins/all_relations.py: collapse inlaws * src/plugins/Ancestors.py: use new calling grandparent string diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py index 554656676..e13c83f3a 100644 --- a/src/plugins/IndivComplete.py +++ b/src/plugins/IndivComplete.py @@ -89,11 +89,17 @@ class IndivCompleteReport(Report): self.filter = filters[filter_num] self.bibli = None - 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() == gen.lib.EventRoleType.PRIMARY or \ + event_ref.get_role() == gen.lib.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() @@ -325,8 +331,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): @@ -387,11 +392,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()