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 9b9ec76b..4ad1d0cd 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 @@ -432,41 +432,41 @@ sealed class QueryCondition : FilterElementRow { } IsToday -> { val startDate = Date() - return realmQuery.between(fieldName, startDate.startOfDay(), startDate.endOfDay()) + return realmQuery.greaterThanOrEqualTo(fieldName, startDate.startOfDay()).and().lessThanOrEqualTo(fieldName, startDate.endOfDay()) } WasTodayAndYesterday-> { val startDate = Date() val calendar = Calendar.getInstance() calendar.time = startDate calendar.add(Calendar.HOUR_OF_DAY, -24) - return realmQuery.between(fieldName, calendar.time.startOfDay(), startDate.endOfDay()) + return realmQuery.greaterThanOrEqualTo(fieldName, calendar.time.startOfDay()).and().lessThanOrEqualTo(fieldName, startDate.endOfDay()) } WasYesterday -> { val calendar = Calendar.getInstance() calendar.time = Date() calendar.add(Calendar.HOUR_OF_DAY, -24) - return realmQuery.between(fieldName, calendar.time.startOfDay(), calendar.time.endOfDay()) + return realmQuery.greaterThanOrEqualTo(fieldName, calendar.time.startOfDay()).and().lessThanOrEqualTo(fieldName, calendar.time.endOfDay()) } DuringThisWeek -> { val startDate = Date() val calendar = Calendar.getInstance() calendar.time = startDate calendar.set(Calendar.DAY_OF_WEEK_IN_MONTH, Calendar.SUNDAY) - return realmQuery.between(fieldName, calendar.time.startOfDay(), startDate.endOfDay()) + return realmQuery.greaterThanOrEqualTo(fieldName, calendar.time.startOfDay()).and().lessThanOrEqualTo(fieldName, startDate.endOfDay()) } DuringThisMonth -> { val startDate = Date() val calendar = Calendar.getInstance() calendar.time = startDate calendar.set(Calendar.DAY_OF_MONTH, 1) - return realmQuery.between(fieldName, calendar.time.startOfDay(), startDate.endOfDay()) + return realmQuery.greaterThanOrEqualTo(fieldName, calendar.time.startOfDay()).and().lessThanOrEqualTo(fieldName, startDate.endOfDay()) } DuringThisYear -> { val startDate = Date() val calendar = Calendar.getInstance() calendar.time = startDate calendar.set(Calendar.DAY_OF_YEAR, 1) - return realmQuery.between(fieldName, calendar.time.startOfDay(), startDate.endOfDay()) + return realmQuery.greaterThanOrEqualTo(fieldName, calendar.time.startOfDay()).and().lessThanOrEqualTo(fieldName, startDate.endOfDay()) } }