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

9389: Narrated Web report - Individual page sort order has changed

Browse Source
This commit is contained in:
SNoiraud 2016-04-20 16:46:43 +02:00
parent b9dec6b109
commit d01896788c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps/plugins/webreport/narrativeweb.py
View File

@ -533,6 +533,11 @@ def format_date(date):
return val return val
return "" return ""
def sort_on_name_and_grampsid(obj, dbase):
person = dbase.get_person_from_handle(obj)
name = _nd.display(person)
return (name, person.get_gramps_id())
def copy_thumbnail(report, handle, photo, region=None): def copy_thumbnail(report, handle, photo, region=None):
""" """
Given a handle (and optional region) make (if needed) an Given a handle (and optional region) make (if needed) an
@ -3185,7 +3190,7 @@ class FamilyPages(BasePage):
letter =' ' letter =' '
# get person from sorted database list # get person from sorted database list
for person_handle in sorted(handle_list): for person_handle in sorted(handle_list, key=lambda x: sort_on_name_and_grampsid(x, self.dbase_)):
person = self.dbase_.get_person_from_handle(person_handle) person = self.dbase_.get_person_from_handle(person_handle)
if person: if person:
family_list = sorted(pers_fam_dict[person_handle], key=lambda x:x.get_gramps_id()) family_list = sorted(pers_fam_dict[person_handle], key=lambda x:x.get_gramps_id())
@ -5342,7 +5347,7 @@ class PersonPages(BasePage):
surname = _ABSENT surname = _ABSENT
first_surname = True first_surname = True
for person_handle in sorted(handle_list): for person_handle in sorted(handle_list, key=lambda x: sort_on_name_and_grampsid(x, self.dbase_)):
person = self.dbase_.get_person_from_handle(person_handle) person = self.dbase_.get_person_from_handle(person_handle)
if person.get_change_time() > date: date = person.get_change_time() if person.get_change_time() > date: date = person.get_change_time()