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

6519: Add primary role option to event filter

Browse Source
This commit is contained in:
Nick Hall 2014-01-26 16:09:17 +00:00
parent f5b57d71fe
commit b8fa348621
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Filters/Rules/Person/_HasEvent.py
View File

@ -50,7 +50,8 @@ class HasEvent(HasEventBase):
_('Date:'), _('Date:'),
_('Place:'), _('Place:'),
_('Description:'), _('Description:'),
_('Main Participants') ] _('Main Participants:'),
_('Primary Role:') ]
name = _('People with the personal <event>') name = _('People with the personal <event>')
description = _("Matches people with a personal event of a particular " description = _("Matches people with a personal event of a particular "
"value") "value")
@ -59,7 +60,7 @@ class HasEvent(HasEventBase):
for event_ref in person.get_event_ref_list(): for event_ref in person.get_event_ref_list():
if not event_ref: if not event_ref:
continue continue
if event_ref.role != EventRoleType.PRIMARY: if int(self.list[5]) and event_ref.role != EventRoleType.PRIMARY:
# Only match primaries, no witnesses # Only match primaries, no witnesses
continue continue
event = dbase.get_event_from_handle(event_ref.ref) event = dbase.get_event_from_handle(event_ref.ref)

3
src/Filters/Rules/_HasEventBase.py
View File

@ -50,7 +50,8 @@ class HasEventBase(Rule):
_('Date:'), _('Date:'),
_('Place:'), _('Place:'),
_('Description:'), _('Description:'),
_('Main Participants') ] _('Main Participants:'),
_('Primary Role:') ]
name = _('Events matching parameters') name = _('Events matching parameters')
description = _("Matches events with particular parameters") description = _("Matches events with particular parameters")
category = _('Event filters') category = _('Event filters')

3
src/Filters/_FilterParser.py
View File

@ -166,6 +166,9 @@ class FilterParser(handler.ContentHandler):
and len(self.a) == 3): and len(self.a) == 3):
self.use_regex = self.a[2] == '1' self.use_regex = self.a[2] == '1'
self.a = self.a[:2] self.a = self.a[:2]
# HasEvent rule has extra primary role field in v3.4.7
if self.r == Rules.Person.HasEvent and len(self.a) == 5:
self.a.append('1')
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

2
src/gui/filtereditor.py
View File

@ -570,6 +570,8 @@ class EditRule(ManagedWindow.ManagedWindow):
elif v == _('Include Family events:'): elif v == _('Include Family events:'):
t = MyBoolean(_('Also family events where person is ' t = MyBoolean(_('Also family events where person is '
'wife/husband')) 'wife/husband'))
elif v == _('Primary Role:'):
t = MyBoolean(_('Only include primary participants'))
elif v == _('Tag:'): elif v == _('Tag:'):
taglist = [''] taglist = ['']
taglist = taglist + [tag.get_name() for tag in dbstate.db.iter_tags()] taglist = taglist + [tag.get_name() for tag in dbstate.db.iter_tags()]