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

misc reports: keep up with RelLib changes

Browse Source 
svn: r6414
This commit is contained in:
Brian Matherly 2006-04-22 06:56:48 +00:00
parent 6f6d2f5ad2
commit 6651f17ace
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps2/ChangeLog
View File

@ -1,3 +1,9 @@
2006-04-21 Brian Matherly <pez4brian@users.sourceforge.net>
* src/PluginUtils/_ReportUtils.py: keep up with RelLib changes
* src/plugins/DetDescendantReport.py: keep up with RelLib changes
* src/plugins/DescendChart.py: keep up with RelLib changes
* src/plugins/DetAncestralReport.py: keep up with RelLib changes
2006-04-21 Alex Roitman <shura@gramps-project.org> 2006-04-21 Alex Roitman <shura@gramps-project.org>
* src/PluginUtils/_ReportUtils.py (buried_str): Typo. * src/PluginUtils/_ReportUtils.py (buried_str): Typo.
* src/plugins/DetDescendantReport.py (write_children): Use child_refs. * src/plugins/DetDescendantReport.py (write_children): Use child_refs.

2
gramps2/src/PluginUtils/_ReportUtils.py
View File

@ -1677,7 +1677,7 @@ def married_rel_str(database,person,family,is_first=True):
'spouse' :_nd.display(spouse) 'spouse' :_nd.display(spouse)
} }
relationship = family.get_relationship()[0] relationship = family.get_relationship()
if is_first: if is_first:
if relationship == RelLib.FamilyRelType.MARRIED: if relationship == RelLib.FamilyRelType.MARRIED:

4
gramps2/src/plugins/DescendChart.py
View File

@ -179,8 +179,8 @@ class DescendChart(Report.Report):
family = self.database.get_family_from_handle(family_handle) family = self.database.get_family_from_handle(family_handle)
for child_handle in family.get_child_handle_list(): for child_ref in family.get_child_ref_list():
sub = self.apply_filter(child_handle, x+2, new_y) sub = self.apply_filter(child_ref.ref, x+2, new_y)
index += sub index += sub
new_y += sub new_y += sub

6
gramps2/src/plugins/DetAncestralReport.py
View File

@ -275,10 +275,10 @@ class DetAncestorReport(Report.Report):
self.doc.end_paragraph() self.doc.end_paragraph()
first = False first = False
self.doc.start_paragraph('DAR-MoreDetails') self.doc.start_paragraph('DAR-MoreDetails')
atype = alt_name.get_type() atype = str( alt_name.get_type() )
self.doc.write_text( self.doc.write_text(
_('%(name_kind)s: %(name)s%(endnotes)s') % { _('%(name_kind)s: %(name)s%(endnotes)s') % {
'name_kind' : Utils.format_name_type( atype ), 'name_kind' : atype,
'name' : alt_name.get_regular_name(), 'name' : alt_name.get_regular_name(),
'endnotes' : self.endnotes(alt_name), 'endnotes' : self.endnotes(alt_name),
}) })
@ -303,7 +303,7 @@ class DetAncestorReport(Report.Report):
self.doc.start_paragraph('DAR-MoreDetails') self.doc.start_paragraph('DAR-MoreDetails')
evtName = Utils.format_event( event.get_type() ) evtName = str( event.get_type() )
if date and place: if date and place:
self.doc.write_text( self.doc.write_text(
_('%(event_name)s: %(date)s, %(place)s%(endnotes)s. ') % { _('%(event_name)s: %(date)s, %(place)s%(endnotes)s. ') % {

4
gramps2/src/plugins/DetDescendantReport.py
View File

@ -306,7 +306,7 @@ class DetDescendantReport(Report.Report):
self.doc.end_paragraph() self.doc.end_paragraph()
first = False first = False
self.doc.start_paragraph('DDR-MoreDetails') self.doc.start_paragraph('DDR-MoreDetails')
atype = Utils.format_name_type( alt_name.get_type() ) atype = str( alt_name.get_type() )
aname = alt_name.get_regular_name() aname = alt_name.get_regular_name()
self.doc.write_text(_('%(name_kind)s: %(name)s%(endnotes)s') % { self.doc.write_text(_('%(name_kind)s: %(name)s%(endnotes)s') % {
'name_kind' : atype, 'name_kind' : atype,
@ -319,7 +319,7 @@ class DetDescendantReport(Report.Report):
for event_ref in person.get_event_ref_list(): for event_ref in person.get_event_ref_list():
event = self.database.get_event_from_handle(event_ref.ref) event = self.database.get_event_from_handle(event_ref.ref)
date = DateHandler.get_date(event) date = DateHandler.get_date(event)
ename = Utils.format_event( event.get_type() ) ename = str( event.get_type() )
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
place = self.database.get_place_from_handle(place_handle).get_title() place = self.database.get_place_from_handle(place_handle).get_title()