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

increase DAR report pylint score from 7.29 to 9.77

Browse Source
This commit is contained in:
Paul Franklin
2016-04-30 09:43:34 -07:00
parent 19e0bdeb3d
commit 1c06a07156
1 changed files with 228 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
gramps/plugins/textreport/detancestralreport.py
View File

@ -45,7 +45,9 @@ import math
from gramps.gen.const import GRAMPS_LOCALE as glocale from gramps.gen.const import GRAMPS_LOCALE as glocale
_ = glocale.translation.gettext _ = glocale.translation.gettext
from gramps.gen.errors import ReportError from gramps.gen.errors import ReportError
from gramps.gen.lib import EventType, FamilyRelType, Person, NoteType from gramps.gen.lib import (EventType, FamilyRelType, Person, NoteType,
EventRoleType)
from gramps.gen.utils.db import get_participant_from_event
from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle,
FONT_SANS_SERIF, FONT_SERIF, FONT_SANS_SERIF, FONT_SERIF,
INDEX_TYPE_TOC, PARA_ALIGN_CENTER) INDEX_TYPE_TOC, PARA_ALIGN_CENTER)
@ -67,7 +69,7 @@ EMPTY_ENTRY = "_____________"
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
# # DetAncestorReport
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
class DetAncestorReport(Report): class DetAncestorReport(Report):
@ -103,6 +105,7 @@ class DetAncestorReport(Report):
addimages - Whether to include images. addimages - Whether to include images.
pid - The Gramps ID of the center person for the report. pid - The Gramps ID of the center person for the report.
name_format - Preferred format to display names name_format - Preferred format to display names
other_events - Whether to include other events.
incl_private - Whether to include private data incl_private - Whether to include private data
living_people - How to handle living people living_people - How to handle living people
years_past_death - Consider as living this many years after death years_past_death - Consider as living this many years after death
@ -121,7 +124,7 @@ class DetAncestorReport(Report):
stdoptions.run_private_data_option(self, menu) stdoptions.run_private_data_option(self, menu)
stdoptions.run_living_people_option(self, menu, self._locale) stdoptions.run_living_people_option(self, menu, self._locale)
self.db = self.database self._db = self.database
self.max_generations = get_value('gen') self.max_generations = get_value('gen')
self.pgbrk = get_value('pagebbg') self.pgbrk = get_value('pagebbg')
@ -146,11 +149,14 @@ class DetAncestorReport(Report):
self.inc_attrs = get_value('incattrs') self.inc_attrs = get_value('incattrs')
self.initial_sosa = get_value('initial_sosa') self.initial_sosa = get_value('initial_sosa')
pid = get_value('pid') pid = get_value('pid')
self.center_person = self.db.get_person_from_gramps_id(pid) self.other_events = get_value('incotherevents')
if (self.center_person == None) :
self.center_person = self._db.get_person_from_gramps_id(pid)
if self.center_person is None:
raise ReportError(_("Person %s is not in the Database") % pid) raise ReportError(_("Person %s is not in the Database") % pid)
stdoptions.run_name_format_option(self, menu) stdoptions.run_name_format_option(self, menu)
self._nd = self._name_display
self.gen_handles = {} self.gen_handles = {}
self.prev_gen_handles = {} self.prev_gen_handles = {}
@ -165,7 +171,7 @@ class DetAncestorReport(Report):
else: else:
empty_place = "" empty_place = ""
self.__narrator = Narrator(self.db, self.verbose, use_call, self.__narrator = Narrator(self._db, self.verbose, use_call,
use_fulldate, empty_date, empty_place, use_fulldate, empty_date, empty_place,
nlocale=self._locale, nlocale=self._locale,
get_endnote_numbers=self.endnotes) get_endnote_numbers=self.endnotes)
@ -173,22 +179,22 @@ class DetAncestorReport(Report):
self.bibli = Bibliography(Bibliography.MODE_DATE|Bibliography.MODE_PAGE) self.bibli = Bibliography(Bibliography.MODE_DATE|Bibliography.MODE_PAGE)
def apply_filter(self, person_handle, index): def apply_filter(self, person_handle, index):
""" recurse up through the generations """
if (not person_handle) or (index >= 2**self.max_generations): if (not person_handle) or (index >= 2**self.max_generations):
return return
self.map[index] = person_handle self.map[index] = person_handle
person = self.db.get_person_from_handle(person_handle) person = self._db.get_person_from_handle(person_handle)
family_handle = person.get_main_parents_family_handle() family_handle = person.get_main_parents_family_handle()
if family_handle: if family_handle:
family = self.db.get_family_from_handle(family_handle) family = self._db.get_family_from_handle(family_handle)
self.apply_filter(family.get_father_handle(), index*2) self.apply_filter(family.get_father_handle(), index*2)
self.apply_filter(family.get_mother_handle(), (index*2)+1) self.apply_filter(family.get_mother_handle(), (index*2)+1)
def write_report(self): def write_report(self):
self.apply_filter(self.center_person.get_handle(), 1) self.apply_filter(self.center_person.get_handle(), 1)
name = self._name_display.display_name( name = self._nd.display_name(self.center_person.get_primary_name())
self.center_person.get_primary_name())
if not name: if not name:
name = self._("Unknown") name = self._("Unknown")
self.doc.start_paragraph("DAR-Title") self.doc.start_paragraph("DAR-Title")
@ -215,13 +221,13 @@ class DetAncestorReport(Report):
self.gen_handles.clear() self.gen_handles.clear()
person_handle = self.map[key] person_handle = self.map[key]
person = self.db.get_person_from_handle(person_handle) person = self._db.get_person_from_handle(person_handle)
self.gen_handles[person_handle] = key self.gen_handles[person_handle] = key
dupperson = self.write_person(key) dupperson = self.write_person(key)
if dupperson == 0: # Is this a duplicate ind record if dupperson == 0: # Is this a duplicate ind record
if self.listchildren or self.inc_events: if self.listchildren or self.inc_events:
for family_handle in person.get_family_handle_list(): for family_handle in person.get_family_handle_list():
family = self.db.get_family_from_handle(family_handle) family = self._db.get_family_from_handle(family_handle)
mother_handle = family.get_mother_handle() mother_handle = family.get_mother_handle()
if (mother_handle is None or if (mother_handle is None or
mother_handle not in iter(self.map.values()) or mother_handle not in iter(self.map.values()) or
@ -238,7 +244,7 @@ class DetAncestorReport(Report):
if self.pgbrkenotes: if self.pgbrkenotes:
self.doc.page_break() self.doc.page_break()
# it ignores language set for Note type (use locale) # it ignores language set for Note type (use locale)
endnotes.write_endnotes(self.bibli, self.db, self.doc, endnotes.write_endnotes(self.bibli, self._db, self.doc,
printnotes=self.inc_srcnotes, printnotes=self.inc_srcnotes,
elocale=self._locale) elocale=self._locale)
@ -252,21 +258,30 @@ class DetAncestorReport(Report):
def write_person(self, key): def write_person(self, key):
""" Output birth, death, parentage, marriage and notes information """ """ Output birth, death, parentage, marriage and notes information """
def write_more_header(first, name):
""" convenience function """
if first:
self.doc.start_paragraph('DAR-MoreHeader')
self.doc.write_text(self._('More about %(person_name)s:')
% {'person_name' : name})
self.doc.end_paragraph()
return False
person_handle = self.map[key] person_handle = self.map[key]
person = self.db.get_person_from_handle(person_handle) person = self._db.get_person_from_handle(person_handle)
plist = person.get_media_list() plist = person.get_media_list()
self.__narrator.set_subject(person) self.__narrator.set_subject(person)
if self.addimages and len(plist) > 0: if self.addimages and len(plist) > 0:
photo = plist[0] photo = plist[0]
ReportUtils.insert_image(self.db, self.doc, photo, self._user) ReportUtils.insert_image(self._db, self.doc, photo, self._user)
self.doc.start_paragraph("DAR-First-Entry", "%d." % self._get_s_s(key)) self.doc.start_paragraph("DAR-First-Entry", "%d." % self._get_s_s(key))
name = self._name_display.display(person) name = self._nd.display(person)
if not name: if not name:
name = self._("Unknown") name = self._("Unknown")
mark = ReportUtils.get_person_mark(self.db, person) mark = ReportUtils.get_person_mark(self._db, person)
self.doc.start_bold() self.doc.start_bold()
self.doc.write_text(name, mark) self.doc.write_text(name, mark)
@ -328,31 +343,25 @@ class DetAncestorReport(Report):
self.doc.write_text(self._("Notes for %s") % name) self.doc.write_text(self._("Notes for %s") % name)
self.doc.end_paragraph() self.doc.end_paragraph()
for notehandle in notelist: for notehandle in notelist:
note = self.db.get_note_from_handle(notehandle) note = self._db.get_note_from_handle(notehandle)
self.doc.write_styled_note(note.get_styledtext(), self.doc.write_styled_note(
note.get_format(), "DAR-Entry", note.get_styledtext(),
contains_html = note.get_type() note.get_format(),
== NoteType.HTML_CODE "DAR-Entry",
contains_html=(note.get_type() == NoteType.HTML_CODE)
) )
first = True first = True
if self.inc_names: if self.inc_names:
for alt_name in person.get_alternate_names(): for alt_name in person.get_alternate_names():
if first: first = write_more_header(first, name)
self.doc.start_paragraph('DAR-MoreHeader')
self.doc.write_text(self._('More about %(person_name)s:')
% {'person_name': name})
self.doc.end_paragraph()
first = False
self.doc.start_paragraph('DAR-MoreDetails') self.doc.start_paragraph('DAR-MoreDetails')
atype = self._get_type(alt_name.get_type()) atype = self._get_type(alt_name.get_type())
self.doc.write_text_citation( self.doc.write_text_citation(
self._('%(name_kind)s: %(name)s%(endnotes)s') % { self._('%(name_kind)s: %(name)s%(endnotes)s') % {
'name_kind' : self._(atype), 'name_kind' : self._(atype),
'name' : alt_name.get_regular_name(), 'name' : alt_name.get_regular_name(),
'endnotes' : self.endnotes(alt_name), 'endnotes' : self.endnotes(alt_name)})
}
)
self.doc.end_paragraph() self.doc.end_paragraph()
if self.inc_events: if self.inc_events:
@ -361,26 +370,20 @@ class DetAncestorReport(Report):
for event_ref in person.get_primary_event_ref_list(): for event_ref in person.get_primary_event_ref_list():
if event_ref == birth_ref or event_ref == death_ref: if event_ref == birth_ref or event_ref == death_ref:
continue continue
first = write_more_header(first, name)
self.write_event(event_ref)
if first: if self.other_events:
self.doc.start_paragraph('DAR-MoreHeader') for event_ref in person.get_event_ref_list():
self.doc.write_text( role = event_ref.get_role()
self._('More about %(person_name)s:') if role in (EventRoleType.PRIMARY, EventRoleType.FAMILY):
% {'person_name' : name}) continue
self.doc.end_paragraph() first = write_more_header(first, name)
first = 0
self.write_event(event_ref) self.write_event(event_ref)
if self.inc_addr: if self.inc_addr:
for addr in person.get_address_list(): for addr in person.get_address_list():
if first: first = write_more_header(first, name)
self.doc.start_paragraph('DAR-MoreHeader')
self.doc.write_text(
self._('More about %(person_name)s:')
% {'person_name' : name})
self.doc.end_paragraph()
first = False
self.doc.start_paragraph('DAR-MoreDetails') self.doc.start_paragraph('DAR-MoreDetails')
text = ReportUtils.get_address_str(addr) text = ReportUtils.get_address_str(addr)
@ -400,20 +403,14 @@ class DetAncestorReport(Report):
if self.inc_attrs: if self.inc_attrs:
attrs = person.get_attribute_list() attrs = person.get_attribute_list()
if first and attrs: if attrs:
self.doc.start_paragraph('DAR-MoreHeader') first = write_more_header(first, name)
self.doc.write_text(
self._('More about %(person_name)s:')
% { 'person_name' : name })
self.doc.end_paragraph()
first = False
for attr in attrs: for attr in attrs:
self.doc.start_paragraph('DAR-MoreDetails') self.doc.start_paragraph('DAR-MoreDetails')
attrName = attr.get_type().type2base() attr_name = attr.get_type().type2base()
# translators: needed for French, ignore otherwise # translators: needed for French, ignore otherwise
text = self._("%(type)s: %(value)s%(endnotes)s") % { text = self._("%(type)s: %(value)s%(endnotes)s") % {
'type' : self._(attrName), 'type' : self._(attr_name),
'value' : attr.get_value(), 'value' : attr.get_value(),
'endnotes' : self.endnotes(attr)} 'endnotes' : self.endnotes(attr)}
self.doc.write_text_citation(text) self.doc.write_text_citation(text)
@ -422,18 +419,18 @@ class DetAncestorReport(Report):
return 0 # Not duplicate person return 0 # Not duplicate person
def write_event(self, event_ref): def write_event(self, event_ref):
""" write out the event """
text = "" text = ""
event = self.db.get_event_from_handle(event_ref.ref) event = self._db.get_event_from_handle(event_ref.ref)
if self.fulldate: if self.fulldate:
date = self._get_date(event.get_date_object()) date = self._get_date(event.get_date_object())
else: else:
date = event.get_date_object().get_year() date = event.get_date_object().get_year()
place = place_displayer.display_event(self.db, event) place = place_displayer.display_event(self._db, event)
self.doc.start_paragraph('DAR-MoreDetails') self.doc.start_paragraph('DAR-MoreDetails')
evtName = self._get_type(event.get_type())
if date and place: if date and place:
text += self._('%(date)s, %(place)s') % { text += self._('%(date)s, %(place)s') % {
'date' : date, 'place' : place} 'date' : date, 'place' : place}
@ -452,8 +449,19 @@ class DetAncestorReport(Report):
if text: if text:
text += ". " text += ". "
event_name = self._(self._get_type(event.get_type()))
role = event_ref.get_role()
if role in (EventRoleType.PRIMARY, EventRoleType.FAMILY):
text = self._('%(event_name)s: %(event_text)s') % { text = self._('%(event_name)s: %(event_text)s') % {
'event_name' : self._(evtName), 'event_name' : event_name,
'event_text' : text}
else:
primaries = get_participant_from_event(self._db, event_ref.ref)
text = self._('%(event_role)s at %(event_name)s '
'of %(primary_person)s: %(event_text)s') % {
'event_role' : self._(role.xml_str()),
'event_name' : event_name,
'primary_person' : primaries,
'event_text' : text} 'event_text' : text}
self.doc.write_text_citation(text) self.doc.write_text_citation(text)
@ -466,10 +474,10 @@ class DetAncestorReport(Report):
if text: if text:
# translators: needed for Arabic, ignore otherwise # translators: needed for Arabic, ignore otherwise
text += self._("; ") text += self._("; ")
attrName = attr.get_type().type2base() attr_name = attr.get_type().type2base()
# translators: needed for French, ignore otherwise # translators: needed for French, ignore otherwise
text += self._("%(type)s: %(value)s%(endnotes)s") % { text += self._("%(type)s: %(value)s%(endnotes)s") % {
'type' : self._(attrName), 'type' : self._(attr_name),
'value' : attr.get_value(), 'value' : attr.get_value(),
'endnotes' : self.endnotes(attr)} 'endnotes' : self.endnotes(attr)}
text = " " + text text = " " + text
@ -483,33 +491,32 @@ class DetAncestorReport(Report):
notelist = event.get_note_list() notelist = event.get_note_list()
notelist.extend(event_ref.get_note_list()) notelist.extend(event_ref.get_note_list())
for notehandle in notelist: for notehandle in notelist:
note = self.db.get_note_from_handle(notehandle) note = self._db.get_note_from_handle(notehandle)
self.doc.write_styled_note(note.get_styledtext(), self.doc.write_styled_note(
note.get_styledtext(),
note.get_format(), note.get_format(),
"DAR-MoreDetails", "DAR-MoreDetails",
contains_html = (note.get_type() contains_html=(note.get_type() == NoteType.HTML_CODE)
== NoteType.HTML_CODE)
) )
def write_parents(self, person): def write_parents(self, person):
""" write the parents """
family_handle = person.get_main_parents_family_handle() family_handle = person.get_main_parents_family_handle()
if family_handle: if family_handle:
family = self.db.get_family_from_handle(family_handle) family = self._db.get_family_from_handle(family_handle)
mother_handle = family.get_mother_handle() mother_handle = family.get_mother_handle()
father_handle = family.get_father_handle() father_handle = family.get_father_handle()
if mother_handle: if mother_handle:
mother = self.db.get_person_from_handle(mother_handle) mother = self._db.get_person_from_handle(mother_handle)
mother_name = self._name_display.display_name( mother_name = self._nd.display_name(mother.get_primary_name())
mother.get_primary_name()) mother_mark = ReportUtils.get_person_mark(self._db, mother)
mother_mark = ReportUtils.get_person_mark(self.db, mother)
else: else:
mother_name = "" mother_name = ""
mother_mark = "" mother_mark = ""
if father_handle: if father_handle:
father = self.db.get_person_from_handle(father_handle) father = self._db.get_person_from_handle(father_handle)
father_name = self._name_display.display_name( father_name = self._nd.display_name(father.get_primary_name())
father.get_primary_name()) father_mark = ReportUtils.get_person_mark(self._db, father)
father_mark = ReportUtils.get_person_mark(self.db, father)
else: else:
father_name = "" father_name = ""
father_mark = "" father_mark = ""
@ -528,17 +535,17 @@ class DetAncestorReport(Report):
""" """
is_first = True is_first = True
for family_handle in person.get_family_handle_list(): for family_handle in person.get_family_handle_list():
family = self.db.get_family_from_handle(family_handle) family = self._db.get_family_from_handle(family_handle)
spouse_handle = ReportUtils.find_spouse(person, family) spouse_handle = ReportUtils.find_spouse(person, family)
if spouse_handle: if spouse_handle:
spouse = self.db.get_person_from_handle(spouse_handle) spouse = self._db.get_person_from_handle(spouse_handle)
spouse_mark = ReportUtils.get_person_mark(self.db, spouse) spouse_mark = ReportUtils.get_person_mark(self._db, spouse)
else: else:
spouse_mark = None spouse_mark = None
text = self.__narrator.get_married_string(family, text = self.__narrator.get_married_string(family,
is_first, is_first,
self._name_display) self._nd)
if text: if text:
self.doc.write_text_citation(text, spouse_mark) self.doc.write_text_citation(text, spouse_mark)
is_first = False is_first = False
@ -552,8 +559,8 @@ class DetAncestorReport(Report):
mother_handle = family.get_mother_handle() mother_handle = family.get_mother_handle()
if mother_handle: if mother_handle:
mother = self.db.get_person_from_handle(mother_handle) mother = self._db.get_person_from_handle(mother_handle)
mother_name = self._name_display.display(mother) mother_name = self._nd.display(mother)
if not mother_name: if not mother_name:
mother_name = self._("Unknown") mother_name = self._("Unknown")
else: else:
@ -561,8 +568,8 @@ class DetAncestorReport(Report):
father_handle = family.get_father_handle() father_handle = family.get_father_handle()
if father_handle: if father_handle:
father = self.db.get_person_from_handle(father_handle) father = self._db.get_person_from_handle(father_handle)
father_name = self._name_display.display(father) father_name = self._nd.display(father)
if not father_name: if not father_name:
father_name = self._("Unknown") father_name = self._("Unknown")
else: else:
@ -570,19 +577,18 @@ class DetAncestorReport(Report):
self.doc.start_paragraph("DAR-ChildTitle") self.doc.start_paragraph("DAR-ChildTitle")
self.doc.write_text( self.doc.write_text(
self._("Children of %(mother_name)s and %(father_name)s") % self._("Children of %(mother_name)s and %(father_name)s")
{'father_name': father_name, % {'father_name': father_name, 'mother_name': mother_name})
'mother_name': mother_name} )
self.doc.end_paragraph() self.doc.end_paragraph()
cnt = 1 cnt = 1
for child_ref in family.get_child_ref_list(): for child_ref in family.get_child_ref_list():
child_handle = child_ref.ref child_handle = child_ref.ref
child = self.db.get_person_from_handle(child_handle) child = self._db.get_person_from_handle(child_handle)
child_name = self._name_display.display(child) child_name = self._nd.display(child)
if not child_name: if not child_name:
child_name = self._("Unknown") child_name = self._("Unknown")
child_mark = ReportUtils.get_person_mark(self.db, child) child_mark = ReportUtils.get_person_mark(self._db, child)
if self.childref and self.prev_gen_handles.get(child_handle): if self.childref and self.prev_gen_handles.get(child_handle):
value = int(self.prev_gen_handles.get(child_handle)) value = int(self.prev_gen_handles.get(child_handle))
@ -605,14 +611,15 @@ class DetAncestorReport(Report):
self.doc.end_paragraph() self.doc.end_paragraph()
def write_family_events(self, family): def write_family_events(self, family):
""" write the family events """
if not family.get_event_ref_list(): if not family.get_event_ref_list():
return return
mother_handle = family.get_mother_handle() mother_handle = family.get_mother_handle()
if mother_handle: if mother_handle:
mother = self.db.get_person_from_handle(mother_handle) mother = self._db.get_person_from_handle(mother_handle)
mother_name = self._name_display.display(mother) mother_name = self._nd.display(mother)
if not mother_name: if not mother_name:
mother_name = self._("Unknown") mother_name = self._("Unknown")
else: else:
@ -620,14 +627,14 @@ class DetAncestorReport(Report):
father_handle = family.get_father_handle() father_handle = family.get_father_handle()
if father_handle: if father_handle:
father = self.db.get_person_from_handle(father_handle) father = self._db.get_person_from_handle(father_handle)
father_name = self._name_display.display(father) father_name = self._nd.display(father)
if not father_name: if not father_name:
father_name = self._("Unknown") father_name = self._("Unknown")
else: else:
father_name = self._("Unknown") father_name = self._("Unknown")
first = 1 first = True
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
if first: if first:
self.doc.start_paragraph('DAR-MoreHeader') self.doc.start_paragraph('DAR-MoreHeader')
@ -636,7 +643,7 @@ class DetAncestorReport(Report):
% {'mother_name' : mother_name, % {'mother_name' : mother_name,
'father_name' : father_name}) 'father_name' : father_name})
self.doc.end_paragraph() self.doc.end_paragraph()
first = 0 first = False
self.write_event(event_ref) self.write_event(event_ref)
def write_mate(self, person): def write_mate(self, person):
@ -645,16 +652,16 @@ class DetAncestorReport(Report):
has_info = False has_info = False
for family_handle in person.get_family_handle_list(): for family_handle in person.get_family_handle_list():
family = self.db.get_family_from_handle(family_handle) family = self._db.get_family_from_handle(family_handle)
ind_handle = None ind_handle = None
if person.get_gender() == Person.MALE: if person.get_gender() == 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()
if ind_handle: if ind_handle:
ind = self.db.get_person_from_handle(ind_handle) ind = self._db.get_person_from_handle(ind_handle)
for event_ref in ind.get_primary_event_ref_list(): for event_ref in ind.get_primary_event_ref_list():
event = self.db.get_event_from_handle(event_ref.ref) event = self._db.get_event_from_handle(event_ref.ref)
if event: if event:
etype = event.get_type() etype = event.get_type()
if (etype == EventType.BAPTISM or if (etype == EventType.BAPTISM or
@ -666,8 +673,8 @@ class DetAncestorReport(Report):
if not has_info: if not has_info:
family_handle = ind.get_main_parents_family_handle() family_handle = ind.get_main_parents_family_handle()
if family_handle: if family_handle:
f = self.db.get_family_from_handle(family_handle) fam = self._db.get_family_from_handle(family_handle)
if f.get_mother_handle() or f.get_father_handle(): if fam.get_mother_handle() or fam.get_father_handle():
has_info = True has_info = True
break break
@ -678,13 +685,13 @@ class DetAncestorReport(Report):
if self.addimages and len(plist) > 0: if self.addimages and len(plist) > 0:
photo = plist[0] photo = plist[0]
ReportUtils.insert_image(self.db, self.doc, ReportUtils.insert_image(self._db, self.doc,
photo, self._user) photo, self._user)
name = self._name_display.display(ind) name = self._nd.display(ind)
if not name: if not name:
name = self._("Unknown") name = self._("Unknown")
mark = ReportUtils.get_person_mark(self.db, ind) mark = ReportUtils.get_person_mark(self._db, ind)
if family.get_relationship() == FamilyRelType.MARRIED: if family.get_relationship() == FamilyRelType.MARRIED:
self.doc.write_text(self._("Spouse: %s") % name, mark) self.doc.write_text(self._("Spouse: %s") % name, mark)
@ -725,10 +732,11 @@ class DetAncestorReport(Report):
self.doc.end_paragraph() self.doc.end_paragraph()
def endnotes(self, obj): def endnotes(self, obj):
""" cite the endnotes for the object """
if not obj or not self.inc_sources: if not obj or not self.inc_sources:
return "" return ""
txt = endnotes.cite_source(self.bibli, self.db, obj, self._locale) txt = endnotes.cite_source(self.bibli, self._db, obj, self._locale)
if txt: if txt:
txt = '<super>' + txt + '</super>' txt = '<super>' + txt + '</super>'
return txt return txt
@ -795,7 +803,8 @@ class DetAncestorOptions(MenuReportOptions):
fulldates = BooleanOption( fulldates = BooleanOption(
_("Use full dates instead of only the year"), True) _("Use full dates instead of only the year"), True)
fulldates.set_help(_("Whether to use full dates instead of just year.")) fulldates.set_help(
_("Whether to use full dates instead of just year."))
addopt("fulldates", fulldates) addopt("fulldates", fulldates)
listc = BooleanOption(_("List children"), True) listc = BooleanOption(_("List children"), True)
@ -815,7 +824,8 @@ class DetAncestorOptions(MenuReportOptions):
_("Whether to use complete sentences or succinct language.")) _("Whether to use complete sentences or succinct language."))
addopt("verbose", verbose) addopt("verbose", verbose)
desref = BooleanOption(_("Add descendant reference in child list"),True) desref = BooleanOption(
_("Add descendant reference in child list"), True)
desref.set_help( desref.set_help(
_("Whether to add descendant references in child list.")) _("Whether to add descendant references in child list."))
addopt("desref", desref) addopt("desref", desref)
@ -854,9 +864,15 @@ class DetAncestorOptions(MenuReportOptions):
incsrcnotes = BooleanOption(_("Include sources notes"), False) incsrcnotes = BooleanOption(_("Include sources notes"), False)
incsrcnotes.set_help(_("Whether to include source notes in the " incsrcnotes.set_help(_("Whether to include source notes in the "
"Endnotes section. Only works if Include sources is selected.")) "Endnotes section. Only works if "
"Include sources is selected."))
addopt("incsrcnotes", incsrcnotes) addopt("incsrcnotes", incsrcnotes)
incotherevents = BooleanOption(_("Include other events"), False)
incotherevents.set_help(_("Whether to include other events "
"people participated in."))
addopt("incotherevents", incotherevents)
# How to handle missing information # How to handle missing information
addopt = partial(menu.add_option, _("Missing information")) addopt = partial(menu.add_option, _("Missing information"))