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

4921: Want a "Main Participants" entry in sidebar eventfilter; cleanup

Browse Source 
svn: r17549
This commit is contained in:
Michiel Nauta 2011-05-22 12:40:37 +00:00
parent 521b8fa98d
commit c07c19dfe3
10 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Filters/Rules/Family/_HasEvent.py
View File

@ -20,6 +20,9 @@
# $Id$
"""
Filter rule to match families with a particular event.
"""
#-------------------------------------------------------------------------
#
# Standard Python modules
@ -45,15 +48,16 @@ class HasEvent(HasEventBase):
labels = [ _('Family event:'),
_('Date:'),
_('Place:'),
_('Description:') ]
_('Description:'),
_('Main Participants') ]
name = _('Families with the <event>')
description = _("Matches families with an event of a particular value")
def apply(self,db,family):
def apply(self, dbase, family):
for event_ref in family.get_event_ref_list():
if not event_ref:
continue
event = db.get_event_from_handle(event_ref.ref)
if HasEventBase.apply(self,db,event):
event = dbase.get_event_from_handle(event_ref.ref)
if HasEventBase.apply(self, dbase, event):
return True
return False

2
src/Filters/Rules/MediaObject/_HasMedia.py
View File

@ -37,7 +37,7 @@ from Filters.Rules._Rule import Rule
#-------------------------------------------------------------------------
#
# HasEvent
# HasMedia
#
#-------------------------------------------------------------------------
class HasMedia(Rule):

2
src/Filters/Rules/Note/_HasNote.py
View File

@ -37,7 +37,7 @@ from Filters.Rules._Rule import Rule
#-------------------------------------------------------------------------
#
# HasEvent
# HasNote
#
#-------------------------------------------------------------------------
class HasNote(Rule):

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

@ -20,6 +20,9 @@
# $Id$
"""
Filter rule to match persons with a particular event.
"""
#-------------------------------------------------------------------------
#
# Standard Python modules
@ -46,18 +49,20 @@ class HasEvent(HasEventBase):
labels = [ _('Personal event:'),
_('Date:'),
_('Place:'),
_('Description:') ]
_('Description:'),
_('Main Participants') ]
name = _('People with the personal <event>')
description = _("Matches people with a personal event of a particular value")
description = _("Matches people with a personal event of a particular "
"value")
def apply(self,db,person):
def apply(self, dbase, person):
for event_ref in person.get_event_ref_list():
if not event_ref:
continue
if event_ref.role != EventRoleType.PRIMARY:
# Only match primaries, no witnesses
continue
event = db.get_event_from_handle(event_ref.ref)
if HasEventBase.apply(self,db,event):
event = dbase.get_event_from_handle(event_ref.ref)
if HasEventBase.apply(self, dbase, event):
return True
return False

2
src/Filters/Rules/Place/_HasPlace.py
View File

@ -38,7 +38,7 @@ from Filters.Rules._Rule import Rule
#-------------------------------------------------------------------------
#
# HasEvent
# HasPlace
#
#-------------------------------------------------------------------------
class HasPlace(Rule):

2
src/Filters/Rules/Repository/_HasRepo.py
View File

@ -37,7 +37,7 @@ from Filters.Rules._Rule import Rule
#-------------------------------------------------------------------------
#
# HasEvent
# HasRepo
#
#-------------------------------------------------------------------------
class HasRepo(Rule):

2
src/Filters/Rules/Source/_HasSource.py
View File

@ -36,7 +36,7 @@ from Filters.Rules._Rule import Rule
#-------------------------------------------------------------------------
#
# HasEvent
# HasSource
#
#-------------------------------------------------------------------------
class HasSource(Rule):

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

@ -39,7 +39,7 @@ from Utils import get_participant_from_event
#-------------------------------------------------------------------------
#
# HasEvent
# HasEventBase
#
#-------------------------------------------------------------------------
class HasEventBase(Rule):

2
src/Filters/SideBar/_FamilySidebarFilter.py
View File

@ -177,7 +177,7 @@ class FamilySidebarFilter(SidebarFilter):
generic_filter.add_rule(rule)
if etype:
rule = HasEvent([etype, u'', u'', u''])
rule = HasEvent([etype, u'', u'', u'', u''])
generic_filter.add_rule(rule)
if rtype:

2
src/Filters/SideBar/_PersonSidebarFilter.py
View File

@ -206,7 +206,7 @@ class PersonSidebarFilter(SidebarFilter):
# Build an event filter if needed
if etype:
rule = HasEvent([etype, u'', u'', u''])
rule = HasEvent([etype, u'', u'', u'', u''])
generic_filter.add_rule(rule)
# Build birth event filter if needed