2753: Detailed reports did not use probably_alive for child text
svn: r12202
This commit is contained in:
@@ -46,6 +46,7 @@ from ReportBase import Bibliography, Endnotes
|
|||||||
import BaseDoc
|
import BaseDoc
|
||||||
import DateHandler
|
import DateHandler
|
||||||
from BasicUtils import name_displayer as _nd
|
from BasicUtils import name_displayer as _nd
|
||||||
|
import Utils
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
@@ -452,9 +453,9 @@ class DetAncestorReport(Report):
|
|||||||
else:
|
else:
|
||||||
father_name = ""
|
father_name = ""
|
||||||
father_mark = ""
|
father_mark = ""
|
||||||
|
alive = Utils.probably_alive(person, self.database)
|
||||||
text = ReportUtils.child_str(person, father_name, mother_name,
|
text = ReportUtils.child_str(person, father_name, mother_name,
|
||||||
bool(person.get_death_ref()),
|
not alive,
|
||||||
firstName,self.verbose)
|
firstName,self.verbose)
|
||||||
if text:
|
if text:
|
||||||
self.doc.write_text(text)
|
self.doc.write_text(text)
|
||||||
|
@@ -47,6 +47,7 @@ from ReportBase import Bibliography, Endnotes
|
|||||||
import BaseDoc
|
import BaseDoc
|
||||||
import DateHandler
|
import DateHandler
|
||||||
from BasicUtils import name_displayer as _nd
|
from BasicUtils import name_displayer as _nd
|
||||||
|
import Utils
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
@@ -360,9 +361,9 @@ class DetDescendantReport(Report):
|
|||||||
else:
|
else:
|
||||||
father_name = ""
|
father_name = ""
|
||||||
father_mark = ""
|
father_mark = ""
|
||||||
|
alive = Utils.probably_alive(person, self.database)
|
||||||
text = ReportUtils.child_str(person, father_name, mother_name,
|
text = ReportUtils.child_str(person, father_name, mother_name,
|
||||||
bool(person.get_death_ref()),
|
not alive,
|
||||||
firstName,self.verbose)
|
firstName,self.verbose)
|
||||||
if text:
|
if text:
|
||||||
self.doc.write_text(text)
|
self.doc.write_text(text)
|
||||||
|
Reference in New Issue
Block a user