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

Sort list of children on birthdate. I guess we may need an option in

Browse Source 
the gui for this.
        * src/plugins/NarrativeWeb.py


svn: r10519
This commit is contained in:
Kees Bakker 2008-04-07 19:38:08 +00:00
parent 125bbae8ac
commit 1fa86e8c93
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/NarrativeWeb.py
View File

@ -1206,7 +1206,7 @@ class MediaPage(BasePage):
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
date = _dd.display(photo.get_date_object()) date = _dd.display(photo.get_date_object())
if date != "": if date:
of.write('\t\t\t<tr>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Date')) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Date'))
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % date) of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % date)
@ -1866,10 +1866,9 @@ class IndividualPage(BasePage):
of.write('\t<div id="pedigree" class="subsection">\n') of.write('\t<div id="pedigree" class="subsection">\n')
of.write('\t\t<h4>%s</h4>\n' % _('Pedigree')) of.write('\t\t<h4>%s</h4>\n' % _('Pedigree'))
of.write('\t\t<ol class="pedigreegen">\n') of.write('\t\t<ol class="pedigreegen">\n')
of.write('\t\t\t')
if father and mother: if father and mother:
of.write('<li>') of.write('\t\t\t<li>')
self.pedigree_person(of, father) self.pedigree_person(of, father)
of.write('\n') of.write('\n')
of.write('\t\t\t\t<ol>\n') of.write('\t\t\t\t<ol>\n')
@ -1879,12 +1878,12 @@ class IndividualPage(BasePage):
of.write('\n') of.write('\n')
of.write('\t\t\t\t\t\t<ol>\n') of.write('\t\t\t\t\t\t<ol>\n')
elif father: elif father:
of.write('<li>') of.write('\t\t\t<li>')
self.pedigree_person(of, father) self.pedigree_person(of, father)
of.write('\n') of.write('\n')
of.write('\t\t\t\t<ol>\n') of.write('\t\t\t\t<ol>\n')
elif mother: elif mother:
of.write('<li class="spouse">') of.write('\t\t\t<li class="spouse">')
self.pedigree_person(of, mother) self.pedigree_person(of, mother)
of.write('\n') of.write('\n')
of.write('\t\t\t\t<ol>\n') of.write('\t\t\t\t<ol>\n')
@ -1913,7 +1912,8 @@ class IndividualPage(BasePage):
of.write('\t\t\t\t\t\t') of.write('\t\t\t\t\t\t')
self.pedigree_family(of) self.pedigree_family(of)
of.write('\t\t\t\t</ol>\n') of.write('\t\t\t\t</ol>\n')
of.write('\t\t\t</li>\n') if father or mother:
of.write('\t\t\t</li>\n')
of.write('\t\t</ol>\n') of.write('\t\t</ol>\n')
of.write('\t</div>\n\n') of.write('\t</div>\n\n')
@ -2019,13 +2019,12 @@ class IndividualPage(BasePage):
db = self.report.database db = self.report.database
child = db.get_person_from_handle(child_handle) child = db.get_person_from_handle(child_handle)
gid = child.get_gramps_id() gid = child.get_gramps_id()
of.write("\t\t\t\t\t\t<li>")
if child_handle in self.ind_list: if child_handle in self.ind_list:
of.write("\t\t\t\t\t\t<li>")
child_name = _nd.display(child) child_name = _nd.display(child)
url = self.report.build_url_fname_html(child_handle, 'ppl', True) url = self.report.build_url_fname_html(child_handle, 'ppl', True)
self.person_link(of, url, child_name, gid) self.person_link(of, url, child_name, gid)
else: else:
of.write("\t\t\t\t\t\t<li>")
of.write(_nd.display(child)) of.write(_nd.display(child))
of.write(u"</li>\n") of.write(u"</li>\n")
@ -2095,8 +2094,11 @@ class IndividualPage(BasePage):
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Siblings")) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Siblings"))
of.write('\t\t\t\t<td class="ColumnValue">\n') of.write('\t\t\t\t<td class="ColumnValue">\n')
of.write('\t\t\t\t\t<ol>\n') of.write('\t\t\t\t\t<ol>\n')
for child_ref in child_ref_list: childlist = [child_ref.ref for child_ref in child_ref_list]
child_handle = child_ref.ref # TODO. Optionally sort children by birthdate
sort = Sort.Sort(self.report.database)
childlist.sort(sort.by_birthdate)
for child_handle in childlist:
sibling.add(child_handle) # remember that we've already "seen" this child sibling.add(child_handle) # remember that we've already "seen" this child
if child_handle != self.person.handle: if child_handle != self.person.handle:
self.display_child_link(of, child_handle) self.display_child_link(of, child_handle)
@ -2170,8 +2172,12 @@ class IndividualPage(BasePage):
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Children")) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _("Children"))
of.write('\t\t\t\t<td class="ColumnValue">\n') of.write('\t\t\t\t<td class="ColumnValue">\n')
of.write('\t\t\t\t\t<ol>\n') of.write('\t\t\t\t\t<ol>\n')
for child_ref in childlist: # TODO. Optionally sort on birthdate
self.display_child_link(of, child_ref.ref) childlist = [child_ref.ref for child_ref in childlist]
sort = Sort.Sort(self.report.database)
childlist.sort(sort.by_birthdate)
for child_handle in childlist:
self.display_child_link(of, child_handle)
of.write('\t\t\t\t\t</ol>\n') of.write('\t\t\t\t\t</ol>\n')
of.write('\t\t\t\t</td>\n') of.write('\t\t\t\t</td>\n')
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
@ -2225,13 +2231,16 @@ class IndividualPage(BasePage):
of.write(self.format_event(event, event_ref)) of.write(self.format_event(event, event_ref))
of.write('</td>\n') of.write('</td>\n')
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
for attr in family.get_attribute_list(): for attr in family.get_attribute_list():
attrType = str(attr.get_type()) attrType = str(attr.get_type())
of.write('\t\t\t<tr>\n') if attrType:
of.write('\t\t\t\t<td class="ColumnType">&nbsp;</td>\n') of.write('\t\t\t<tr>\n')
of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>' % attrType) of.write('\t\t\t\t<td class="ColumnType">&nbsp;</td>\n')
of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % attr.get_value()) of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>' % attrType)
of.write('\t\t\t</tr>\n') of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % attr.get_value())
of.write('\t\t\t</tr>\n')
notelist = family.get_note_list() notelist = family.get_note_list()
for notehandle in notelist: for notehandle in notelist:
note = db.get_note_from_handle(notehandle) note = db.get_note_from_handle(notehandle)
@ -2304,6 +2313,8 @@ class IndividualPage(BasePage):
date = _dd.display(event.get_date_object()) date = _dd.display(event.get_date_object())
# TODO. This logic does not work for LTR languages. We should go
# back to what it was. (Sorry, I (keestux) messed up.)
text = '' text = ''
if descr: if descr:
text += descr text += descr