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

Bug#3932: Fixed events doubling up in class EventListPage.

Browse Source 
svn: r15473
This commit is contained in:
Rob G. Healey 2010-05-25 05:57:18 +00:00
parent a393d793fc
commit 515b9525dd
1 changed files with 169 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,6 +321,56 @@ class BasePage(object):
self.create_media = report.options['gallery'] self.create_media = report.options['gallery']
self.inc_events = report.options['inc_events'] self.inc_events = report.options['inc_events']
def complete_people(self, tcell, first_person, handle_list):
"""
completes the person column for classes EventListPage and EventPage
@param: db -- report database
@param: tcell -- table cell from its caller
@param: first_person -- variable from its callers
@param: handle_list -- handle list from the backlink of the event_handle
"""
db = self.report.database
for (classname, handle) in handle_list:
# personal event
if classname == "Person":
_obj = db.get_person_from_handle(handle)
if _obj:
_name = self.get_name(_obj)
tcell += _name
if not first_person:
tcell += ", "
first_person = False
# family event
else:
_obj = db.get_family_from_handle(handle)
if _obj:
# husband and spouse in this example, are called father and mother
husband_handle = _obj.get_father_handle()
spouse_handle = _obj.get_mother_handle()
husband = db.get_person_from_handle(husband_handle)
spouse = db.get_person_from_handle(spouse_handle)
if husband:
husband_name = self.get_name(husband)
if spouse:
spouse_name = self.get_name(spouse)
if spouse and husband:
tcell += ( Html("span", husband_name, class_ = "father fatherNmother") +
Html("span", spouse_name, class_ = "mother")
)
elif spouse:
tcell += Html("span", spouse_name, class_ = "mother")
elif husband:
tcell += Html("span", husband_name, class_ = "father")
# return tcell, and first_person back to its callers
return tcell, first_person
def dump_attribute(self, attr, showsrc): def dump_attribute(self, attr, showsrc):
""" """
dump attribute for object presented in display_attr_list() dump attribute for object presented in display_attr_list()
@ -2414,6 +2464,7 @@ class EventListPage(BasePage):
@param: event_types: a list of the type in the events database for this class @param: event_types: a list of the type in the events database for this class
@param: event_handle_list -- a list of event handles @param: event_handle_list -- a list of event handles
@param: progressmeter -- Progress Meter Bar
""" """
BasePage.__init__(self, report, title) BasePage.__init__(self, report, title)
db = report.database db = report.database
@ -2431,7 +2482,8 @@ class EventListPage(BasePage):
eventlist += Html("p", msg, id = "description") eventlist += Html("p", msg, id = "description")
# get alphabet navigation for class EventListPage # get alphabet navigation for class EventListPage
alpha_nav, event_types = alphabet_navigation(event_types, _ALPHAEVENT) menu_set = get_first_letters(db, event_types, _ALPHAEVENT)
alpha_nav, menu_set = alphabet_navigation(menu_set, _KEYEVENT)
if alpha_nav is not None: if alpha_nav is not None:
eventlist += alpha_nav eventlist += alpha_nav
@ -2448,10 +2500,11 @@ class EventListPage(BasePage):
trow.extend( trow.extend(
Html("th", label, class_ = "Column" + colclass, inline = True) Html("th", label, class_ = "Column" + colclass, inline = True)
for (label, colclass) in [ for (label, colclass) in [
[THEAD, "Type"], [_("Letter"), "Letter"],
[DHEAD, "Date"], [THEAD, "Type"],
[GRAMPSID, "GRAMPSID"], [DHEAD, "Date"],
[_PERSON, "Person"] ] [GRAMPSID, "GRAMPSID"],
[_PERSON, "Person"] ]
) )
tbody = Html("tbody") tbody = Html("tbody")
@ -2459,89 +2512,85 @@ class EventListPage(BasePage):
# separate events by their type and then thier event handles # separate events by their type and then thier event handles
for (evt_type, datalist) in sort_event_types(db, event_types, event_handle_list): for (evt_type, datalist) in sort_event_types(db, event_types, event_handle_list):
first_letter = True
_EVENT_DISPLAYED = []
# sort datalist by date of event
datalist = sorted(datalist, key = self._getEventDate)
first_event = True first_event = True
for (date, gid, event_handle) in datalist: while datalist:
event_handle = datalist[0]
event = db.get_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
_type = event.type
gid = event.gramps_id
trow = Html("tr") # check to see if we have listed this gramps_id yet?
tbody += trow if gid not in _EVENT_DISPLAYED:
# display Event type if first in the list # family event
tcell = Html("td", class_ = "ColumnType", inline = True) if _type in _EVENTMAP:
trow += tcell handle_list = db.find_backlink_handles(event_handle, include_classes = ['Family'])
if first_event:
trow.attr = 'class = "BeginEvent"'
tcell += Html("a", evt_type, name = evt_type,
title = _("Event types beginning with %(eventtype)s") % {
'eventtype': evt_type}, inline = True)
else:
tcell += " "
# event date # personal event
tcell = Html("td", class_ = "ColumnDate", inline = True) else:
trow += tcell handle_list = db.find_backlink_handles(event_handle, include_classes = ['Person'])
if date and date is not Date.EMPTY: if handle_list:
tcell += _dd.display(date)
else:
tcell += " "
# GRAMPS ID trow = Html("tr")
trow += ( Html("td", class_ = "ColumnGRAMPSID", inline = True) + tbody += trow
self.event_grampsid_link(event_handle, gid, None)
)
# Person; see the end of the plugin to see these events... # set up hyperlinked letter for alphabet_navigation
if event.type in _EVENTMAP: tcell = Html("td", class_ = "ColumnLetter", inline = True)
trow += tcell
handle_list = db.find_backlink_handles(event_handle, include_classes = ['Family']) ltr = evt_type[0].capitalize()
else: if first_letter:
handle_list = db.find_backlink_handles(event_handle, include_classes = ['Person']) trow.attr = 'class = "BeginLetter"'
tcell += Html("a", ltr, name = ltr,
if handle_list: title = _("Event types beginning with letter " + ltr), inline = True)
first_person = True first_letter = False
tcell = Html("td", class_ = "ColumnPerson")
trow += tcell
# clasname can be either Person or Family
for (classname, handle) in handle_list:
if classname == "Person":
person = db.get_person_from_handle(handle)
if person:
person_name = self.get_name(person)
tcell += person_name
if not first_person:
tcell += ", "
else: else:
family = db.get_family_from_handle(handle) tcell += " "
if family:
# display Event type if first in the list
tcell = Html("td", class_ = "ColumnType", inline = True)
trow += tcell
if first_event:
tcell += evt_type
else:
tcell += " "
# husband and spouse in this example, are called father and mother # event date
husband_handle = family.get_father_handle() tcell = Html("td", class_ = "ColumnDate", inline = True)
spouse_handle = family.get_mother_handle() trow += tcell
husband = db.get_person_from_handle(husband_handle) date = gen.lib.Date.EMPTY
spouse = db.get_person_from_handle(spouse_handle) if event:
if husband: date = event.get_date_object()
husband_name = self.get_name(husband) if date and date is not gen.lib.Date.EMPTY:
if spouse: tcell += _dd.display(date)
spouse_name = self.get_name(spouse) else:
if spouse and husband: tcell += " "
tcell += ( Html("span", husband_name, class_ = "father fatherNmother") +
Html("span", spouse_name, class_ = "mother") # GRAMPS ID
) trow += ( Html("td", class_ = "ColumnGRAMPSID") +
elif spouse: self.event_grampsid_link(event_handle, gid, None)
tcell += Html("span", spouse_name, class_ = "mother") )
elif husband:
tcell += Html("span", husband_name, class_ = "father") # Person(s) column
first_person = False tcell = Html("td", class_ = "ColumnPerson")
else: trow += tcell
tcell += " "
first_event = False # classname can either be a person or a family
first_person = True
# get person(s) for ColumnPerson
self.complete_people(tcell, first_person, handle_list)
_EVENT_DISPLAYED.append( gid )
first_event = False
datalist.remove("%s" % event_handle)
# add clearline for proper styling # add clearline for proper styling
# add footer section # add footer section
@ -2552,6 +2601,19 @@ class EventListPage(BasePage):
# and close the file # and close the file
self.XHTMLWriter(eventslistpage, of) self.XHTMLWriter(eventslistpage, of)
def _getEventDate(self, event_handle):
event_date = gen.lib.Date.EMPTY
event = self.report.database.get_event_from_handle(event_handle)
if event:
date = event.get_date_object()
if date:
# returns the date in YYYY-MM-DD format
return gen.lib.Date(date.get_year(), date.get_month(), date.get_day())
# return empty date string
return event_date
def event_grampsid_link(self, handle, grampsid, up): def event_grampsid_link(self, handle, grampsid, up):
""" """
create a hyperlink from event handle, but show grampsid create a hyperlink from event handle, but show grampsid
@ -2560,7 +2622,7 @@ class EventListPage(BasePage):
url = self.report.build_url_fname_html(handle, "evt", up) url = self.report.build_url_fname_html(handle, "evt", up)
# return hyperlink to its caller # return hyperlink to its caller
return Html("a", grampsid, href = url, alt = grampsid) return Html("a", grampsid, href = url, alt = grampsid, inline = True)
class EventPage(BasePage): class EventPage(BasePage):
def __init__(self, report, title, event_handle): def __init__(self, report, title, event_handle):
@ -2569,10 +2631,11 @@ class EventPage(BasePage):
@param: title -- is the title of the web pages @param: title -- is the title of the web pages
@param: event_handle -- the event handle for the database @param: event_handle -- the event handle for the database
@param: progressmeter -- progress meter bar
""" """
db = report.database db = report.database
event = db.get_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
evt_type = str(event.type)
evt_gid = event.gramps_id evt_gid = event.gramps_id
BasePage.__init__(self, report, title, evt_gid) BasePage.__init__(self, report, title, evt_gid)
@ -2599,6 +2662,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()
@ -2613,60 +2683,26 @@ class EventPage(BasePage):
Html('td', data, class_ = "Column" + colclass) Html('td', data, class_ = "Column" + colclass)
) )
tbody += trow tbody += trow
# Person; see the end of the plugin to see these events...
if event.type in _EVENTMAP:
trow = Html("tr") + (
Html("td", _("Person(s)"), class_ = "ColumnAttribute", inline = True)
)
tbody += trow
tcell = Html("td", class_ = "ColumnPerson")
trow += tcell
# Person(s) field
if event.type in _EVENTMAP:
handle_list = db.find_backlink_handles(event_handle, include_classes = ['Family']) handle_list = db.find_backlink_handles(event_handle, include_classes = ['Family'])
else: else:
handle_list = db.find_backlink_handles(event_handle, include_classes = ['Person']) handle_list = db.find_backlink_handles(event_handle, include_classes = ["Person"])
if handle_list: if handle_list:
first_person = True first_person = True
trow = Html("tr") + ( # get person(s) for ColumnPerson
Html("td", _PERSON, class_ = "ColumnAttribute", inline = True) self.complete_people(tcell, first_person, handle_list)
)
tbody += trow
tcell = Html("td", class_ = "ColumnPerson")
trow += tcell
# clasname can be either Person or Family
for (classname, handle) in handle_list:
if classname == "Person":
person = db.get_person_from_handle(handle)
if person:
person_name = self.get_name(person)
tcell += person_name
if not first_person:
tcell += ", "
else:
family = db.get_family_from_handle(handle)
if family:
# husband and spouse in this example, are called father and mother
husband_handle = family.get_father_handle()
spouse_handle = family.get_mother_handle()
husband = db.get_person_from_handle(husband_handle)
spouse = db.get_person_from_handle(spouse_handle)
if husband:
husband_name = self.get_name(husband)
if spouse:
spouse_name = self.get_name(spouse)
if spouse and husband:
tcell += ( Html("span", husband_name, class_ = "father fatherNmother") +
Html("span", spouse_name, class_ = "mother")
)
elif spouse:
tcell += Html("span", spouse_name, class_ = "mother")
elif husband:
tcell += Html("span", husband_name, class_ = "father")
first_person = False
# Narrative subsection # Narrative subsection
notelist = event.get_note_list() notelist = event.get_note_list()
@ -2674,7 +2710,7 @@ class EventPage(BasePage):
if notelist is not None: if notelist is not None:
eventdetail += notelist eventdetail += notelist
# Attribute subsection # get attribute list
attrlist = event.get_attribute_list() attrlist = event.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:
@ -2692,7 +2728,7 @@ class EventPage(BasePage):
# send page out for processing # send page out for processing
# and close the page # and close the page
self.XHTMLWriter(eventpage, of) self.XHTMLWriter(eventpage, of)
class MediaPage(BasePage): class MediaPage(BasePage):
@ -5463,14 +5499,11 @@ class NavWebReport(Report):
# send all data to the events list page # send all data to the events list page
EventListPage(self, self.title, event_types, event_handle_list) EventListPage(self, self.title, event_types, event_handle_list)
index = 0
for event_handle in event_handle_list: for event_handle in event_handle_list:
self.progress.set_header(_("Creating event page %02d of %02d") % (index + 1, len(event_handle_list)))
# create individual event pages # create individual event pages
EventPage(self, self.title, event_handle) EventPage(self, self.title, event_handle)
index += 1
self.progress.step() self.progress.step()
def gallery_pages(self, source_list): def gallery_pages(self, source_list):
@ -6205,9 +6238,7 @@ def sort_event_types(db, event_types, event_handle_list):
# add (gramps_id, date, handle) from this event # add (gramps_id, date, handle) from this event
if etype in event_dict: if etype in event_dict:
event_dict[etype].append( event_dict[etype].append( handle )
(event.get_date_object(), event.gramps_id, handle)
)
for tup_list in event_dict.values(): for tup_list in event_dict.values():
tup_list.sort() tup_list.sort()
@ -6241,7 +6272,11 @@ def __get_person_keyname(db, handle):
def __get_place_keyname(db, handle): def __get_place_keyname(db, handle):
""" ... """ """ ... """
return ReportUtils.place_name(db, handle) place = db.get_place_from_handle(handle)
if place:
return ReportUtils.place_name(db, handle)
else:
return ""
def first_letter(string): def first_letter(string):
if string: if string: