From 37c33bd15a80335a070ebf12aaad03f4576c721e Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Wed, 26 Jun 2019 08:02:44 +0200 Subject: [PATCH] fix issue with current week filter --- .../android/model/filter/QueryCondition.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt index c3ec3331..84d9fcd9 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt @@ -765,12 +765,14 @@ sealed class QueryCondition : FilterElementRow { return realmQuery } is DuringThisWeek -> { - val startDate = Date() val calendar = Calendar.getInstance() - calendar.time = startDate - calendar.set(Calendar.DAY_OF_WEEK_IN_MONTH, Calendar.SUNDAY) + calendar.set(Calendar.HOUR_OF_DAY, 0) + calendar.clear(Calendar.MINUTE) + calendar.clear(Calendar.SECOND) + calendar.clear(Calendar.MILLISECOND) + calendar.set(Calendar.DAY_OF_WEEK, calendar.firstDayOfWeek) return realmQuery.greaterThanOrEqualTo(fieldName, calendar.time.startOfDay()).and() - .lessThanOrEqualTo(fieldName, startDate.endOfDay()) + .lessThanOrEqualTo(fieldName, Date().endOfDay()) } is DuringThisMonth -> { val startDate = Date()