|
|
|
|
@ -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() |
|
|
|
|
|