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

* src/plugins/DetDescendantReport.py: New Date usage.

Browse Source 
svn: r3685
This commit is contained in:
Alex Roitman 2004-10-28 16:21:33 +00:00
parent 0d68f5d230
commit b8daa8f930
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2004-10-28 Alex Roitman <shura@alex.neuro.umn.edu>
* src/plugins/DetDescendantReport.py: New Date usage.
2004-10-27 Tim Waugh <twaugh@redhat.com> 2004-10-27 Tim Waugh <twaugh@redhat.com>
* src/plugins/Ancestors.py: Fixed typo spotted by Eero Tamminen. * src/plugins/Ancestors.py: Fixed typo spotted by Eero Tamminen.

57
src/plugins/DetDescendantReport.py
View File

@ -304,7 +304,8 @@ class DetDescendantReport(Report.Report):
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if birth_handle: if birth_handle:
birth = self.database.get_event_from_handle(birth_handle) birth = self.database.get_event_from_handle(birth_handle)
date = birth.get_date_object().get_start_date() date_obj = birth.get_date_object()
date_txt = birth.get_date()
if birth.get_place_handle(): if birth.get_place_handle():
place = self.database.get_place_from_handle(birth.get_place_handle()).get_title() place = self.database.get_place_from_handle(birth.get_place_handle()).get_title()
if place[-1:] == '.': if place[-1:] == '.':
@ -314,18 +315,18 @@ class DetDescendantReport(Report.Report):
else: else:
place = "" place = ""
if date.get_date(): if date_txt:
if date.get_day_valid() and date.get_month_valid() and \ if date_obj.get_day_valid() and date_obj.get_month_valid() and \
rptOptions.fullDate == reportOptions.Yes: rptOptions.fullDate == reportOptions.Yes:
if place: if place:
self.doc.write_text(_(" was born on %s in %s.") % (date.get_date(), place)) self.doc.write_text(_(" was born on %s in %s.") % (date_txt, place))
else: else:
self.doc.write_text(_(" was born on %s.") % date.get_date()) self.doc.write_text(_(" was born on %s.") % date_txt )
elif place: elif place:
self.doc.write_text(_(" was born in the year %s in %s.") % \ self.doc.write_text(_(" was born in the year %s in %s.") % \
(date.get_year(), place)) (date_obj.get_year(), place))
else: else:
self.doc.write_text(_(" was born in the year %s.") % date.get_year()) self.doc.write_text(_(" was born in the year %s.") % date_obj.get_year())
elif place: elif place:
self.doc.write_text(_(" was born in %s.") % place) self.doc.write_text(_(" was born in %s.") % place)
else: else:
@ -360,7 +361,8 @@ class DetDescendantReport(Report.Report):
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if death_handle: if death_handle:
death = self.database.get_event_from_handle(death_handle) death = self.database.get_event_from_handle(death_handle)
date = death.get_date_object().get_start_date() date_obj = death.get_date_object()
date_txt = death.get_date()
place_handle = death.get_place_handle() place_handle = death.get_place_handle()
if place_handle: if place_handle:
place = self.database.get_place_from_handle(place_handle).get_title() place = self.database.get_place_from_handle(place_handle).get_title()
@ -371,12 +373,12 @@ class DetDescendantReport(Report.Report):
else: else:
place = "" place = ""
if date.get_date(): if date_txt:
if date.get_day() and date.get_month() and \ if date_obj.get_day() and date_obj.get_month() and \
rptOptions.fullDate == reportOptions.Yes: rptOptions.fullDate == reportOptions.Yes:
fulldate = date.get_date() fulldate = date_txt
elif date.get_month() and rptOptions.fullDate == reportOptions.Yes: elif date_obj.get_month() and rptOptions.fullDate == reportOptions.Yes:
fulldate = "%s %s" % (date.get_month(), date.get_year()) fulldate = "%s %s" % (date_obj.get_month(), date_obj.get_year())
else: else:
fulldate = "" fulldate = ""
elif rptOptions.blankDate == reportOptions.Yes: elif rptOptions.blankDate == reportOptions.Yes:
@ -389,11 +391,11 @@ class DetDescendantReport(Report.Report):
t = _(" %s died on %s in %s") % (firstName, fulldate, place) t = _(" %s died on %s in %s") % (firstName, fulldate, place)
else: else:
t = _(" %s died on %s") % (firstName, fulldate) t = _(" %s died on %s") % (firstName, fulldate)
elif date.get_year() > 0: elif date_obj.get_year() > 0:
if place: if place:
t = _(" %s died in %s in %s") % (firstName, date.get_year(), place) t = _(" %s died in %s in %s") % (firstName, date_obj.get_year(), place)
else: else:
t = _(" %s died in %s") % (firstName, date.get_year()) t = _(" %s died in %s") % (firstName, date_obj.get_year())
elif place: elif place:
t = _(" %s died in %s") % (firstName, place) t = _(" %s died in %s") % (firstName, place)
@ -410,15 +412,16 @@ class DetDescendantReport(Report.Report):
fam = self.database.get_family_from_handle(fam_id) fam = self.database.get_family_from_handle(fam_id)
buried = None buried = None
if buried: if buried:
date = buried.get_date_object().get_start_date() date_obj = buried.get_date_object()
date_txt = buried.get_date()
place = buried.get_place_name() place = buried.get_place_name()
if place[-1:] == '.': if place[-1:] == '.':
place = place[:-1] place = place[:-1]
fulldate= "" fulldate= ""
if date.get_date() != "": if date_txt:
if date.get_day_valid() and date.get_month_valid() and \ if date_obj.get_day_valid() and date_obj.get_month_valid() and \
rptOptions.fullDate == reportOptions.Yes: rptOptions.fullDate == reportOptions.Yes:
fulldate= date.get_date() fulldate= date_txt
elif rptOptions.blankDate == reportOptions.Yes: elif rptOptions.blankDate == reportOptions.Yes:
fulldate= "___________" fulldate= "___________"
@ -537,12 +540,12 @@ class DetDescendantReport(Report.Report):
elif rptOptions.blankPlace == reportOptions.Yes: elif rptOptions.blankPlace == reportOptions.Yes:
place= "____________" place= "____________"
date = marriage.get_date_object() date_obj = marriage.get_date_object()
if date: if date_obj:
if date.get_year_valid(): if date_obj.get_year_valid():
if date.get_day_valid() and date.get_month_valid() and \ if date_obj.get_day_valid() and date_obj.get_month_valid() and \
rptOptions.fullDate == reportOptions.Yes: rptOptions.fullDate == reportOptions.Yes:
fulldate = date.get_date() fulldate = marriage.get_date()
elif rptOptions.blankDate == reportOptions.Yes: elif rptOptions.blankDate == reportOptions.Yes:
fulldate = "__________" fulldate = "__________"
@ -1323,13 +1326,13 @@ class reportOptions:
birth_handle = ind.get_birth_handle() birth_handle = ind.get_birth_handle()
if birth_handle: if birth_handle:
birth = self.database.get_event_from_handle(birth_handle).get_date_object().get_start_date() birth = self.database.get_event_from_handle(birth_handle).get_date_object()
birth_year_valid = birth.get_year_valid() birth_year_valid = birth.get_year_valid()
else: else:
birth_year_valid = None birth_year_valid = None
death_handle = ind.get_death_handle() death_handle = ind.get_death_handle()
if death_handle: if death_handle:
death = self.database.get_event_from_handle(death_handle).get_date_object().get_start_date() death = self.database.get_event_from_handle(death_handle).get_date_object()
death_year_valid = death.get_year_valid() death_year_valid = death.get_year_valid()
else: else:
death_year_valid = None death_year_valid = None