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

Common calendar on Statistics chart

Browse Source 
Fixes #12571.
This commit is contained in:
romjerome 2022-02-19 11:35:43 +01:00 committed by Nick Hall
parent fde2e180d5
commit 70e62d438d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gramps/plugins/drawreport/statisticschart.py
View File

@ -40,11 +40,12 @@ from functools import partial
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gramps.gen.config import config
from gramps.gen.const import GRAMPS_LOCALE as glocale from gramps.gen.const import GRAMPS_LOCALE as glocale
_ = glocale.translation.sgettext _ = glocale.translation.sgettext
# Person and relation types # Person and relation types
from gramps.gen.lib import Person, FamilyRelType, EventType, EventRoleType from gramps.gen.lib import Person, FamilyRelType, EventType, EventRoleType
from gramps.gen.lib.date import Date, gregorian from gramps.gen.lib.date import Date
# gender and report type names # gender and report type names
from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, from gramps.gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
FONT_SANS_SERIF, FONT_SERIF, FONT_SANS_SERIF, FONT_SERIF,
@ -230,6 +231,8 @@ def estimate_age(dbase, person,
@rtype: tuple @rtype: tuple
""" """
calendar = config.get('preferences.calendar-format-report')
bhandle = None bhandle = None
if start_handle: if start_handle:
bhandle = start_handle bhandle = start_handle
@ -251,8 +254,10 @@ def estimate_age(dbase, person,
return (-1, -1) return (-1, -1)
bdata = dbase.get_event_from_handle(bhandle).get_date_object() bdata = dbase.get_event_from_handle(bhandle).get_date_object()
bdata = bdata.to_calendar(calendar)
if dhandle: if dhandle:
ddata = dbase.get_event_from_handle(dhandle).get_date_object() ddata = dbase.get_event_from_handle(dhandle).get_date_object()
ddata = ddata.to_calendar(calendar)
else: else:
if today is not None: if today is not None:
ddata = today ddata = today
@ -427,6 +432,7 @@ class Extract:
def get_year(self, event): def get_year(self, event):
"return year for given event" "return year for given event"
date = event.get_date_object() date = event.get_date_object()
date = date.to_calendar(self.calendar)
if date: if date:
year = date.get_year() year = date.get_year()
if year: if year:
@ -681,6 +687,7 @@ class Extract:
self._ = rlocale.translation.sgettext self._ = rlocale.translation.sgettext
self._get_type = rlocale.get_type self._get_type = rlocale.get_type
self._get_date = rlocale.get_date self._get_date = rlocale.get_date
self.calendar = config.get('preferences.calendar-format-report')
data = [] data = []
ext = self.extractors ext = self.extractors
@ -704,7 +711,7 @@ class Extract:
if birth: if birth:
birthdate = birth.get_date_object() birthdate = birth.get_date_object()
if birthdate.get_year_valid(): if birthdate.get_year_valid():
birthdate = gregorian(birthdate) birthdate = birthdate.to_calendar(self.calendar)
year = birthdate.get_year() year = birthdate.get_year()
if not (year >= year_from and year <= year_to): if not (year >= year_from and year <= year_to):
@ -715,7 +722,7 @@ class Extract:
if death: if death:
deathdate = death.get_date_object() deathdate = death.get_date_object()
if deathdate.get_year_valid(): if deathdate.get_year_valid():
deathdate = gregorian(deathdate) deathdate = deathdate.to_calendar(self.calendar)
if deathdate.get_year() < year_from: if deathdate.get_year() < year_from:
continue continue