From a09d207bd5bab0ab1c9af06bd1c2deb65fa43731 Mon Sep 17 00:00:00 2001 From: Stuart Skelton Date: Tue, 25 Jul 2017 22:19:04 +0100 Subject: Refactor filterDay to re-use some code. --- todolist/date_filter.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'todolist') diff --git a/todolist/date_filter.go b/todolist/date_filter.go index b91bee3..dadf101 100644 --- a/todolist/date_filter.go +++ b/todolist/date_filter.go @@ -112,16 +112,9 @@ func (f *DateFilter) filterCompletedToday(pivot time.Time) []*Todo { } func (f *DateFilter) filterDay(pivot time.Time, day time.Weekday) []*Todo { - var ret []*Todo - filtered := f.filterThisWeek(pivot) - for _, todo := range filtered { - dueTime, _ := time.ParseInLocation("2006-01-02", todo.Due, f.Location) - if dueTime.Weekday() == day { - ret = append(ret, todo) - } - - } - return ret + thisWeek := NewDateFilter(f.filterThisWeek(pivot)) + pivot = f.FindSunday(pivot).AddDate(0, 0, int(day)) + return thisWeek.filterToExactDate(pivot) } func (f *DateFilter) filterBetweenDatesInclusive(begin, end time.Time, filterOn func(*Todo) string) []*Todo { -- cgit v1.3 From 01b81d64e1efa669d1c36c76d0561182c652066e Mon Sep 17 00:00:00 2001 From: Stuart Skelton Date: Sat, 12 Aug 2017 17:39:42 +0100 Subject: Add a filterOn function to the filterDay func --- todolist/date_filter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'todolist') diff --git a/todolist/date_filter.go b/todolist/date_filter.go index dadf101..261e5ad 100644 --- a/todolist/date_filter.go +++ b/todolist/date_filter.go @@ -114,7 +114,7 @@ func (f *DateFilter) filterCompletedToday(pivot time.Time) []*Todo { func (f *DateFilter) filterDay(pivot time.Time, day time.Weekday) []*Todo { thisWeek := NewDateFilter(f.filterThisWeek(pivot)) pivot = f.FindSunday(pivot).AddDate(0, 0, int(day)) - return thisWeek.filterToExactDate(pivot) + return thisWeek.filterToExactDate(pivot, filterOnDue) } func (f *DateFilter) filterBetweenDatesInclusive(begin, end time.Time, filterOn func(*Todo) string) []*Todo { -- cgit v1.3