From 748fbd09490722b56db98abe2f2b77b06d653463 Mon Sep 17 00:00:00 2001 From: SNoiraud Date: Thu, 26 Mar 2020 11:39:05 +0100 Subject: [PATCH] Age: test if the death is the same day as birth --- gramps/gui/editors/displaytabs/eventrefmodel.py | 6 ++++-- gramps/plugins/gramplet/events.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gramps/gui/editors/displaytabs/eventrefmodel.py b/gramps/gui/editors/displaytabs/eventrefmodel.py index 8d550042f..35ba1858b 100644 --- a/gramps/gui/editors/displaytabs/eventrefmodel.py +++ b/gramps/gui/editors/displaytabs/eventrefmodel.py @@ -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) diff --git a/gramps/plugins/gramplet/events.py b/gramps/plugins/gramplet/events.py index add09796b..dd17da864 100644 --- a/gramps/plugins/gramplet/events.py +++ b/gramps/plugins/gramplet/events.py @@ -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)