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

2003-07-17 Tim Waugh <twaugh@redhat.com>

Browse Source 
* src/plugins/Ancestors.py: Include other names in the notes.
        Include birth/marriage/death descriptions.


svn: r1897
This commit is contained in:
Tim Waugh 2003-07-17 10:54:41 +00:00
parent 2cc7e6d1e4
commit e24e67fc7e
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/ChangeLog
View File

@ -1,6 +1,7 @@
2003-07-17 Tim Waugh <twaugh@redhat.com> 2003-07-17 Tim Waugh <twaugh@redhat.com>
* src/plugins/Ancestors.py: Change report name. Include addresses. * src/plugins/Ancestors.py: Include other names in the notes.
Better generation headings. Include nickname. Include birth/marriage/death descriptions. Change report name.
Include addresses. Better generation headings. Include nickname.
2003-07-16 Donald Peterson <dpeterson@sigmaxi.org> 2003-07-16 Donald Peterson <dpeterson@sigmaxi.org>
* doc/gramps-manual/C/figures/bookreport.png: * doc/gramps-manual/C/figures/bookreport.png:

24
gramps2/src/plugins/Ancestors.py
View File

@ -367,11 +367,13 @@ class ComprehensiveAncestorsReport (Report.Report):
def event_info (self, event): def event_info (self, event):
info = '' info = ''
name = event.getName () name = event.getName ()
description = event.getDescription ()
if name != 'Birth' and name != 'Death' and name != 'Marriage': if name != 'Birth' and name != 'Death' and name != 'Marriage':
info += name info += name
description = event.getDescription ()
if description: if description:
info += ': ' + description info += ': ' + description
description = None
dateobj = event.getDateObj () dateobj = event.getDateObj ()
if dateobj: if dateobj:
text = dateobj.getText () text = dateobj.getText ()
@ -392,8 +394,15 @@ class ComprehensiveAncestorsReport (Report.Report):
if placename: if placename:
info += ' in ' + placename info += ' in ' + placename
note = event.getNote () note = event.getNote ()
if note: if note or description:
info += ' (' + note + ')' info += ' ('
if description:
info += description
if note:
if description:
info += '; '
info += note
info += ')'
info += self.cite_sources (event.getSourceRefList ()) info += self.cite_sources (event.getSourceRefList ())
return info return info
@ -631,9 +640,10 @@ class ComprehensiveAncestorsReport (Report.Report):
else: else:
paras = [] paras = []
names = person.getAlternateNames ()
events = person.getEventList () events = person.getEventList ()
addresses = person.getAddressList () addresses = person.getAddressList ()
if (len (events) + len (addresses)) > 0: if (len (events) + len (addresses) + len (names)) > 0:
paras.append ((self.doc.start_paragraph, ['SubEntry'])) paras.append ((self.doc.start_paragraph, ['SubEntry']))
paras.append ((self.doc.write_text, paras.append ((self.doc.write_text,
["More about " + ["More about " +
@ -641,6 +651,12 @@ class ComprehensiveAncestorsReport (Report.Report):
":"])) ":"]))
paras.append ((self.doc.end_paragraph, [])) paras.append ((self.doc.end_paragraph, []))
for name in names:
paras.append ((self.doc.start_paragraph, ['Details']))
paras.append ((self.doc.write_text, [name.getType () + ': ' +
name.getRegularName ()]))
paras.append ((self.doc.end_paragraph, []))
for event in events: for event in events:
paras.append ((self.doc.start_paragraph, ['Details'])) paras.append ((self.doc.start_paragraph, ['Details']))
paras.append ((self.doc.write_text, [self.event_info (event)])) paras.append ((self.doc.write_text, [self.event_info (event)]))