Suppress age = 0 days in events list

If the reference event date is equal to the event date, don't show the age
except if the date is estimated, calculated, ...

Fixes #0007745
This commit is contained in:
SNoiraud 2020-03-25 19:50:44 +01:00 committed by Paul Culley
parent 6cbc2b896d
commit e2e659dc94
2 changed files with 10 additions and 3 deletions

View File

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

View File

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