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

Fixed EventDetail pages in ColumnPerson... First individual was being shown twice in the line

Browse Source 
svn: r15398
This commit is contained in:
Rob G. Healey 2010-05-13 06:17:43 +00:00
parent b3e5f17baf
commit 44a360c1bf
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2538,6 +2538,7 @@ class EventListPage(BasePage):
return Html("a", grampsid, href = url, alt = grampsid) return Html("a", grampsid, href = url, alt = grampsid)
class EventPage(BasePage): class EventPage(BasePage):
def __init__(self, report, title, event_handle): def __init__(self, report, title, event_handle):
""" """
Creates the individual event page Creates the individual event page
@ -2573,6 +2574,13 @@ class EventPage(BasePage):
tbody = Html("tbody") tbody = Html("tbody")
table += tbody table += tbody
if not self.noid and evt_gid:
trow = Html("tr") + (
Html("td", GRAMPSID, class_ = "ColumnAttribute", inline = True),
Html("td", evt_gid, class_ = "ColumnGRAMPSID", inline = True)
)
tbody += trow
# get event data # get event data
""" """
for more information: see get_event_data() for more information: see get_event_data()
@ -2588,37 +2596,23 @@ class EventPage(BasePage):
) )
tbody += trow tbody += trow
# Person trow = Html("tr") + (
if evt_type in ["Divorce", "Marriage"]: Html("td", _("Person(s)"), class_ = "ColumnAttribute", inline = True)
handle_list = db.find_backlink_handles(event_handle, )
include_classes = ['Person', 'Family']) tbody += trow
else:
handle_list = db.find_backlink_handles(event_handle, include_classes = ['Person'])
if handle_list: tcell = Html("td", class_ = "ColumnPerson")
first_person = True trow += tcell
trow = Html("tr") + ( # Person(s) field
Html("td", _PERSON, class_ = "ColumnAttribute", inline = True) if evt_type in ["Divorce", "Marriage", "Marriage filing", "Annulment"]:
)
tbody += trow
tcell = Html("td", class_ = "ColumnPerson") handle_list = db.find_backlink_handles(event_handle, include_classes = ['Family'])
trow += tcell if handle_list:
# clasname can be either Person or Family # clasname can be either Person or Family
for (classname, handle) in handle_list: for (classname, handle) in handle_list:
if classname == "Person":
person = db.get_person_from_handle(handle)
if person:
person_name = self.get_name(person)
if not first_person:
tcell += ", "
tcell += person_name
else:
family = db.get_family_from_handle(handle) family = db.get_family_from_handle(handle)
if family: if family:
@ -2639,19 +2633,30 @@ class EventPage(BasePage):
tcell += Html("span", spouse_name, class_ = "mother") tcell += Html("span", spouse_name, class_ = "mother")
elif husband: elif husband:
tcell += Html("span", husband_name, class_ = "father") tcell += Html("span", husband_name, class_ = "father")
first_person = False first_person = False
else:
first_person = True
handle_list = db.find_backlink_handles(event_handle, include_classes = ['Person'])
if handle_list:
for (classname, handle) in handle_list:
person = db.get_person_from_handle(handle)
if person:
person_name = self.get_name(person)
tcell += person_name
if not first_person:
tcell += ", "
first_person = False
# Narrative subsection # Narrative subsection
# evt_ref = event.get_reference()
notelist = event.get_note_list() notelist = event.get_note_list()
# notelist.extend(evt_ref.get_note_list() )
notelist = self.display_note_list(notelist) notelist = self.display_note_list(notelist)
if notelist is not None: if notelist is not None:
eventdetail += notelist eventdetail += notelist
# get attribute list # get attribute list
attrlist = event.get_attribute_list() attrlist = event.get_attribute_list()
# attrlist.extend(evt_ref.get_attribute_list() )
attrlist = self.display_attr_list(attrlist, True) attrlist = self.display_attr_list(attrlist, True)
if attrlist is not None: if attrlist is not None:
eventdetail += attrlist eventdetail += attrlist