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

Simplified the listing of the class FamilyListPage(), so that a couple is only shown once in the list.

Browse Source 
svn: r18123
This commit is contained in:
Rob G. Healey 2011-09-08 09:23:10 +00:00
parent 09e9e253fa
commit 1f290c934d
1 changed files with 77 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
src/plugins/webreport/NarrativeWeb.py
View File

@ -2643,7 +2643,7 @@ class SurnamePage(BasePage):
self.XHTMLWriter(surnamepage, of) self.XHTMLWriter(surnamepage, of)
class FamilyListPage(BasePage): class FamilyListPage(BasePage):
def __init__(self, report, title, ind_list): def __init__(self, report, title, ind_list, displayed):
BasePage.__init__(self, report, title) BasePage.__init__(self, report, title)
db = report.database db = report.database
@ -2704,89 +2704,92 @@ class FamilyListPage(BasePage):
for phandle in handle_list: for phandle in handle_list:
person = db.get_person_from_handle(phandle) person = db.get_person_from_handle(phandle)
if person: if person:
if phandle not in displayed:
fam_hnd_list = person.get_family_handle_list() fam_hnd_list = person.get_family_handle_list()
if fam_hnd_list: if fam_hnd_list:
first_family = True first_family = True
for fhandle in fam_hnd_list: for fhandle in fam_hnd_list:
family = db.get_family_from_handle(fhandle) family = db.get_family_from_handle(fhandle)
if family: if family:
trow = Html("tr") trow = Html("tr")
tbody += trow tbody += trow
tcell = Html("td", class_ ="ColumnRowLabel") tcell = Html("td", class_ ="ColumnRowLabel")
trow += tcell trow += tcell
if letter not in ltrs_displayed: if letter not in ltrs_displayed:
trow.attr = 'class ="BeginLetter"' trow.attr = 'class ="BeginLetter"'
tcell += Html("a", letter, name =letter, tcell += Html("a", letter, name =letter,
title ="Families: " + letter, inline =True) title ="Families: " + letter, inline =True)
ltrs_displayed[letter] = True ltrs_displayed[letter] = True
else: else:
tcell += ' ' tcell += ' '
tcell = Html("td", class_ ="ColumnPartner") tcell = Html("td", class_ ="ColumnPartner")
trow += tcell trow += tcell
if first_family: if first_family:
trow.attr = 'class ="BeginFamily"' trow.attr = 'class ="BeginFamily"'
url = self.report.build_url_fname_html(fhandle, "fam") url = self.report.build_url_fname_html(fhandle, "fam")
tcell += self.family_link(url, self.get_name(person), tcell += self.family_link(url, self.get_name(person),
person.get_gramps_id()) person.get_gramps_id())
first_family = False
else:
tcell += ' '
tcell = Html("td", class_ ="ColumnPartner")
trow += tcell
# get partner if there is one listed?
partner_handle = ReportUtils.find_spouse(person, family)
if partner_handle:
partner = db.get_person_from_handle(partner_handle)
if partner:
displayed.add(partner_handle)
if check_person_database(partner_handle, ind_list):
url = self.report.build_url_fname_html(fhandle, "fam")
tcell += self.family_link(url, self.get_name(partner),
partner.get_gramps_id())
else:
tcell += self.get_name(partner)
else:
tcell += ' '
# family events; such as marriage and divorce events
fam_evt_ref_list = family.get_event_ref_list()
tcell1 = Html("td", class_ ="ColumnMarriage", inline =True)
tcell2 = Html("td", class_ ="ColumnDivorce", inline =True)
trow += (tcell1, tcell2)
if fam_evt_ref_list:
for evt_ref in fam_evt_ref_list:
event = db.get_event_from_handle(evt_ref.ref)
if event:
evt_type = event.get_type()
if evt_type in [gen.lib.EventType.MARRIAGE,
gen.lib.EventType.DIVORCE]:
if evt_type == gen.lib.EventType.MARRIAGE:
tcell1 += _dd.display(event.get_date_object())
else:
tcell1 += ' '
if evt_type == gen.lib.EventType.DIVORCE:
tcell2 += _dd.display(event.get_date_object())
else:
tcell2 += ' '
else:
tcell1 += ' '
tcell2 += ' '
first_family = False first_family = False
else: displayed.add(phandle)
tcell += ' '
tcell = Html("td", class_ ="ColumnPartner")
trow += tcell
# get partner if there is one listed?
partner_handle = ReportUtils.find_spouse(person, family)
if partner_handle:
partner = db.get_person_from_handle(partner_handle)
if partner:
if check_person_database(partner_handle, ind_list):
url = self.report.build_url_fname_html(fhandle, "fam")
tcell += self.family_link(url, self.get_name(partner),
partner.get_gramps_id())
else:
tcell += self.get_name(partner)
else:
tcell += ' '
# family events; such as marriage and divorce events
fam_evt_ref_list = family.get_event_ref_list()
tcell1 = Html("td", class_ ="ColumnMarriage", inline =True)
tcell2 = Html("td", class_ ="ColumnDivorce", inline =True)
trow += (tcell1, tcell2)
if fam_evt_ref_list:
for evt_ref in fam_evt_ref_list:
event = db.get_event_from_handle(evt_ref.ref)
if event:
evt_type = event.get_type()
if evt_type in [gen.lib.EventType.MARRIAGE,
gen.lib.EventType.DIVORCE]:
if evt_type == gen.lib.EventType.MARRIAGE:
tcell1 += _dd.display(event.get_date_object())
else:
tcell1 += ' '
if evt_type == gen.lib.EventType.DIVORCE:
tcell2 += _dd.display(event.get_date_object())
else:
tcell2 += ' '
else:
tcell1 += ' '
tcell2 += ' '
first_family = False
# add clearline for proper styling # add clearline for proper styling
# add footer section # add footer section
@ -6612,7 +6615,8 @@ class NavWebReport(Report):
# set ProgressMeter for Families/ Relationship pages... # set ProgressMeter for Families/ Relationship pages...
self.progress.set_pass(_("Creating family pages..."), len(db.get_family_handles() )) self.progress.set_pass(_("Creating family pages..."), len(db.get_family_handles() ))
FamilyListPage(self, self.title, ppl_hnd_list) displayed = set()
FamilyListPage(self, self.title, ppl_hnd_list, displayed)
for phandle in ppl_hnd_list: for phandle in ppl_hnd_list:
person = db.get_person_from_handle(phandle) person = db.get_person_from_handle(phandle)