Add HasDayOfWeek rule

This commit is contained in:
Nick Hall 2014-02-03 22:15:30 +00:00
parent 356e36fe78
commit 3a1c3901db
5 changed files with 73 additions and 1 deletions

View File

@ -49,6 +49,7 @@ from ._hasdata import HasData
from ._changedsince import ChangedSince from ._changedsince import ChangedSince
from ._hastag import HasTag from ._hastag import HasTag
from ._matchesplacefilter import MatchesPlaceFilter from ._matchesplacefilter import MatchesPlaceFilter
from ._hasdayofweek import HasDayOfWeek
editor_rule_list = [ editor_rule_list = [
AllEvents, AllEvents,
@ -70,5 +71,6 @@ editor_rule_list = [
HasData, HasData,
ChangedSince, ChangedSince,
HasTag, HasTag,
MatchesPlaceFilter MatchesPlaceFilter,
HasDayOfWeek
] ]

View File

@ -0,0 +1,54 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2013 Nick Hall
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#-------------------------------------------------------------------------
#
# Standard Python modules
#
#-------------------------------------------------------------------------
from gramps.gen.const import GRAMPS_LOCALE as glocale
_ = glocale.translation.sgettext
#-------------------------------------------------------------------------
#
# Gramps modules
#
#-------------------------------------------------------------------------
from .. import Rule
#-------------------------------------------------------------------------
#
# HasDayOfWeek
#
#-------------------------------------------------------------------------
class HasDayOfWeek(Rule):
"""Rule that matches an event occurring on a particular day of the week."""
labels = [ _('Day of Week:') ]
name = _('Events occurring on a particular day of the week')
description = _('Matches events occurring on a particular day of the week')
category = _('General filters')
def apply(self, db, event):
if not self.list[0]:
return False
else:
dow = event.get_date_object().get_dow()
return dow == int(self.list[0])

View File

@ -1507,6 +1507,16 @@ class Date(object):
""" """
return self.text return self.text
def get_dow(self):
"""
Return an integer representing the day of the week associated with the
date (Monday=0).
If the day is not defined, a None is returned. If the date is a
compound date, the lower date day is returned.
"""
return self.sortval % 7 if self.is_regular() else None
def _zero_adjust_ymd(self, y, m, d): def _zero_adjust_ymd(self, y, m, d):
year = y if y != 0 else 1 year = y if y != 0 else 1
month = max(m, 1) month = max(m, 1)

View File

@ -74,6 +74,7 @@ from gramps.gen.utils.db import family_name
from gramps.gen.utils.string import conf_strings from gramps.gen.utils.string import conf_strings
from gramps.gen.constfunc import cuni from gramps.gen.constfunc import cuni
from ..widgets import DateEntry from ..widgets import DateEntry
from gramps.gen.datehandler import displayer
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -583,6 +584,10 @@ class EditRule(ManagedWindow):
[_(conf_strings[i]) for i in range(5)]) [_(conf_strings[i]) for i in range(5)])
elif v == _('Date:'): elif v == _('Date:'):
t = DateEntry(self.uistate, self.track) t = DateEntry(self.uistate, self.track)
elif v == _('Day of Week:'):
long_days = displayer.long_days
days_of_week = long_days[2:] + long_days[1:2]
t = MyList(map(str, range(7)), days_of_week)
else: else:
t = MyEntry() t = MyEntry()
tlist.append(t) tlist.append(t)

View File

@ -70,6 +70,7 @@ gramps/gen/filters/rules/event/_eventprivate.py
gramps/gen/filters/rules/event/_hasattribute.py gramps/gen/filters/rules/event/_hasattribute.py
gramps/gen/filters/rules/event/_hascitation.py gramps/gen/filters/rules/event/_hascitation.py
gramps/gen/filters/rules/event/_hasdata.py gramps/gen/filters/rules/event/_hasdata.py
gramps/gen/filters/rules/event/_hasdayofweek.py
gramps/gen/filters/rules/event/_hasgallery.py gramps/gen/filters/rules/event/_hasgallery.py
gramps/gen/filters/rules/event/_hasidof.py gramps/gen/filters/rules/event/_hasidof.py
gramps/gen/filters/rules/event/_hasnote.py gramps/gen/filters/rules/event/_hasnote.py