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

Date part of issue 4160. Use of option Use full dates instead of full year works again.

Browse Source 
svn: r15845
This commit is contained in:
Peter Landgren 2010-09-01 16:17:36 +00:00
parent 0894288476
commit 6bb686ec2d
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/textreport/DetAncestralReport.py
View File

@ -104,6 +104,7 @@ class DetAncestorReport(Report):
self.pgbrk = menu.get_option_by_name('pagebbg').get_value()
self.pgbrkenotes = menu.get_option_by_name('pageben').get_value()
self.fulldate = menu.get_option_by_name('fulldates').get_value()
use_fulldate = self.fulldate
self.listchildren = menu.get_option_by_name('listc').get_value()
self.includenotes = menu.get_option_by_name('incnotes').get_value()
use_call = menu.get_option_by_name('usecall').get_value()
@ -138,7 +139,8 @@ class DetAncestorReport(Report):
else:
empty_place = ""
self.__narrator = Narrator(self.database, self.verbose, use_call,
self.__narrator = Narrator(self.database, self.verbose,
use_call, use_fulldate,
empty_date, empty_place,
get_endnote_numbers=self.endnotes)
@ -333,10 +335,15 @@ class DetAncestorReport(Report):
self.doc.end_paragraph()
first = False
self.doc.start_paragraph('DAR-MoreDetails')
text = ReportUtils.get_address_str(addr)
date = DateHandler.get_date(addr)
self.doc.write_text(_('Address: '))
if self.fulldate:
date = DateHandler.get_date(addr)
else:
date = addr.get_date_object().get_year()
if date:
self.doc.write_text( '%s, ' % date )
self.doc.write_text( text )
@ -366,7 +373,12 @@ class DetAncestorReport(Report):
def write_event(self, event_ref):
text = ""
event = self.database.get_event_from_handle(event_ref.ref)
date = DateHandler.get_date(event)
if self.fulldate:
date = DateHandler.get_date(event)
else:
date = event.get_date_object().get_year()
ph = event.get_place_handle()
if ph:
place = self.database.get_place_from_handle(ph).get_title()

18
src/plugins/textreport/DetDescendantReport.py
View File

@ -109,6 +109,7 @@ class DetDescendantReport(Report):
self.pgbrk = menu.get_option_by_name('pagebbg').get_value()
self.pgbrkenotes = menu.get_option_by_name('pageben').get_value()
self.fulldate = menu.get_option_by_name('fulldates').get_value()
use_fulldate = self.fulldate
self.listchildren = menu.get_option_by_name('listc').get_value()
self.inc_notes = menu.get_option_by_name('incnotes').get_value()
use_call = menu.get_option_by_name('usecall').get_value()
@ -149,7 +150,8 @@ class DetDescendantReport(Report):
else:
empty_place = ""
self.__narrator = Narrator(self.database, self.verbose, use_call,
self.__narrator = Narrator(self.database, self.verbose,
use_call, use_fulldate,
empty_date, empty_place,
get_endnote_numbers=self.endnotes)
@ -359,7 +361,12 @@ class DetDescendantReport(Report):
def write_event(self, event_ref):
text = ""
event = self.database.get_event_from_handle(event_ref.ref)
date = DateHandler.get_date(event)
if self.fulldate:
date = DateHandler.get_date(event)
else:
date = event.get_date_object().get_year()
ph = event.get_place_handle()
if ph:
place = self.database.get_place_from_handle(ph).get_title()
@ -686,7 +693,12 @@ class DetDescendantReport(Report):
self.doc.start_paragraph('DDR-MoreDetails')
text = ReportUtils.get_address_str(addr)
date = DateHandler.get_date(addr)
if self.fulldate:
date = DateHandler.get_date(addr)
else:
date = addr.get_date_object().get_year()
self.doc.write_text(_('Address: '))
if date:
self.doc.write_text( '%s, ' % date )