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

Age: test if the death is the same day as birth

Browse Source
This commit is contained in:
SNoiraud 2020-03-26 11:39:05 +01:00 committed by Paul Culley
parent e2e659dc94
commit 748fbd0949
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/gui/editors/displaytabs/eventrefmodel.py
View File

@ -46,7 +46,7 @@ from html import escape
#
#-------------------------------------------------------------------------
from ...widgets.undoablebuffer import UndoableBuffer
from gramps.gen.lib import (EventRoleType, Date)
from gramps.gen.lib import (EventRoleType, EventType, Date)
from gramps.gen.datehandler import get_date, get_date_valid
from gramps.gen.config import config
from gramps.gen.utils.db import get_participant_from_event
@ -175,7 +175,9 @@ class EventRefModel(Gtk.TreeStore):
"""
date = event.get_date_object()
if date and self.start_date:
if date == self.start_date and date.modifier == Date.MOD_NONE:
if (date == self.start_date and date.modifier == Date.MOD_NONE
and not (event.get_type().is_death_fallback() or
event.get_type() == EventType.DEATH)):
return ""
else:
return (date - self.start_date).format(precision=age_precision)

6
gramps/plugins/gramplet/events.py
View File

@ -32,7 +32,7 @@ from gi.repository import Gtk
from gramps.gui.editors import EditEvent
from gramps.gui.listmodel import ListModel, NOSORT
from gramps.gen.plug import Gramplet
from gramps.gen.lib import Date
from gramps.gen.lib import (EventType, Date)
from gramps.gen.plug.report.utils import find_spouse
from gramps.gui.dbguielement import DbGUIElement
from gramps.gen.display.place import displayer as place_displayer
@ -130,7 +130,9 @@ class Events(Gramplet, DbGUIElement):
date = event.get_date_object()
start_date = self.cached_start_date
if date and start_date:
if date == start_date and date.modifier == Date.MOD_NONE:
if (date == start_date and date.modifier == Date.MOD_NONE
and not (event.get_type().is_death_fallback() or
event.get_type() == EventType.DEATH)):
return ""
else:
return (date - start_date).format(precision=age_precision)