fix issue with current week filter

dev^2
Razmig Sarkissian 6 years ago
parent ceb9fb40ff
commit fa5e098b31
  1. 10
      app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt

@ -765,12 +765,14 @@ sealed class QueryCondition : FilterElementRow {
return realmQuery return realmQuery
} }
is DuringThisWeek -> { is DuringThisWeek -> {
val startDate = Date()
val calendar = Calendar.getInstance() val calendar = Calendar.getInstance()
calendar.time = startDate calendar.set(Calendar.HOUR_OF_DAY, 0)
calendar.set(Calendar.DAY_OF_WEEK_IN_MONTH, Calendar.SUNDAY) 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() return realmQuery.greaterThanOrEqualTo(fieldName, calendar.time.startOfDay()).and()
.lessThanOrEqualTo(fieldName, startDate.endOfDay()) .lessThanOrEqualTo(fieldName, Date().endOfDay())
} }
is DuringThisMonth -> { is DuringThisMonth -> {
val startDate = Date() val startDate = Date()

Loading…
Cancel
Save