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

2784: Detailed Ancestral Report – center-person's spouse has no

Browse Source 
heading (inconsistent with Detailed Descendant Report) 
2783: Detailed Ancestral Report lists center-person's children 
      twice



svn: r12333
This commit is contained in:
Benny Malengier 2009-03-14 08:49:14 +00:00
parent 55d5595d47
commit 20c9e73d70
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/textreport/DetAncestralReport.py
View File

@ -185,6 +185,9 @@ class DetAncestorReport(Report):
if mother_handle is None or \ if mother_handle is None or \
mother_handle not in self.map.values() or \ mother_handle not in self.map.values() or \
person.get_gender() == gen.lib.Person.FEMALE: person.get_gender() == gen.lib.Person.FEMALE:
# The second test above also covers the 1. person's
# mate, which is not an ancestor and as such is not
# included in the self.map dictionary
if self.listchildren: if self.listchildren:
self.write_children(family) self.write_children(family)
if self.inc_events: if self.inc_events:
@ -569,15 +572,15 @@ class DetAncestorReport(Report):
first = 0 first = 0
self.write_event(event_ref) self.write_event(event_ref)
def write_mate(self, mate): def write_mate(self, person):
"""Output birth, death, parentage, marriage and notes information """ """Output birth, death, parentage, marriage and notes information """
ind = None ind = None
has_info = False has_info = False
for family_handle in mate.get_family_handle_list(): for family_handle in person.get_family_handle_list():
family = self.database.get_family_from_handle(family_handle) family = self.database.get_family_from_handle(family_handle)
ind_handle = None ind_handle = None
if mate.get_gender() == gen.lib.Person.MALE: if person.get_gender() == gen.lib.Person.MALE:
ind_handle = family.get_mother_handle() ind_handle = family.get_mother_handle()
else: else:
ind_handle = family.get_father_handle() ind_handle = family.get_father_handle()
@ -602,7 +605,7 @@ class DetAncestorReport(Report):
break break
if has_info: if has_info:
self.doc.start_paragraph("DAR-Entry") self.doc.start_paragraph("DAR-MoreHeader")
plist = ind.get_media_list() plist = ind.get_media_list()
@ -613,11 +616,16 @@ class DetAncestorReport(Report):
name = _nd.display_formal(ind) name = _nd.display_formal(ind)
mark = ReportUtils.get_person_mark(self.database, ind) mark = ReportUtils.get_person_mark(self.database, ind)
self.doc.write_text(name, mark) if family.get_relationship() == gen.lib.FamilyRelType.MARRIED:
if name[-1:] == '.': self.doc.write_text(_("Spouse: %s") % name, mark)
self.doc.write_text_citation("%s " % self.endnotes(ind))
else: else:
self.doc.write_text_citation("%s. " % self.endnotes(ind)) self.doc.write_text(_("Relationship with: %s") % name, mark)
if name[-1:] != '.':
self.doc.write_text(".")
self.doc.write_text_citation(self.endnotes(ind))
self.doc.end_paragraph()
self.doc.start_paragraph("DAR-Entry")
first_name = ReportUtils.common_name(ind, self.usecall) first_name = ReportUtils.common_name(ind, self.usecall)
print_name = first_name print_name = first_name
@ -635,6 +643,13 @@ class DetAncestorReport(Report):
self.doc.write_text_citation(text) self.doc.write_text_citation(text)
print_name = 0 print_name = 0
text = ReportUtils.christened_str(self.database, ind, print_name,
self.verbose, self.endnotes, self.EMPTY_DATE,
self.EMPTY_PLACE)
if text:
self.doc.write_text_citation(text)
print_name = 0
span = self.calc_age(ind) span = self.calc_age(ind)
text = ReportUtils.died_str(self.database, ind, print_name, text = ReportUtils.died_str(self.database, ind, print_name,
self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE, self.verbose, self.EMPTY_DATE, self.EMPTY_PLACE,
@ -657,12 +672,6 @@ class DetAncestorReport(Report):
self.doc.end_paragraph() self.doc.end_paragraph()
if has_info and mate.get_gender() == gen.lib.Person.MALE:
if self.listchildren:
self.write_children(family)
if self.inc_events:
self.write_family_events(family)
def calc_age(self,ind): def calc_age(self,ind):
""" """
Calulate age. Calulate age.