add dynamic date query type

feature/top10
Razmig Sarkissian 7 years ago
parent 83226b7175
commit f243c418ab
  1. 13
      app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
  2. 13
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt

@ -6,7 +6,11 @@ import net.pokeranalytics.android.exceptions.PokerAnalyticsException
import net.pokeranalytics.android.model.realm.FilterCondition import net.pokeranalytics.android.model.realm.FilterCondition
import net.pokeranalytics.android.model.realm.FilterElementBlind import net.pokeranalytics.android.model.realm.FilterElementBlind
import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.model.realm.Session
import java.time.*
import java.util.* import java.util.*
import java.time.temporal.TemporalQueries.zoneId
/** /**
@ -58,6 +62,12 @@ enum class QueryCondition(var operator: Operator? = null) {
YEAR, YEAR,
WEEK_DAY, WEEK_DAY,
WEEK_END, WEEK_END,
TODAY,
YESTERDAY,
TODAY_AND_YESTERDAY,
THIS_WEEK,
THIS_MONTH,
THIS_YEAR,
CURRENCY, CURRENCY,
CURRENCY_CODE, CURRENCY_CODE,
@ -232,6 +242,9 @@ enum class QueryCondition(var operator: Operator? = null) {
} }
query.`in`(fieldName, arrayOf(Calendar.SATURDAY, Calendar.SUNDAY)) query.`in`(fieldName, arrayOf(Calendar.SATURDAY, Calendar.SUNDAY))
} }
TODAY, YESTERDAY, TODAY_AND_YESTERDAY, THIS_WEEK, THIS_MONTH, THIS_YEAR -> {
realmQuery
}
else -> { else -> {
throw PokerAnalyticsException.QueryTypeUnhandled throw PokerAnalyticsException.QueryTypeUnhandled
} }

@ -79,14 +79,13 @@ sealed class FilterElementRow : RowRepresentable {
is Online -> QueryCondition.ONLINE is Online -> QueryCondition.ONLINE
is Weekday -> QueryCondition.WEEK_DAY is Weekday -> QueryCondition.WEEK_DAY
is Weekend -> QueryCondition.WEEK_END is Weekend -> QueryCondition.WEEK_END
is Today -> QueryCondition.TODAY
is Yesterday -> QueryCondition.YESTERDAY
is TodayAndYesterday -> QueryCondition.TODAY_AND_YESTERDAY
is CurrentWeek -> QueryCondition.THIS_WEEK
is CurrentMonth -> QueryCondition.THIS_MONTH
is CurrentYear -> QueryCondition.THIS_YEAR
/* /*
is Today -> QueryCondition.
is Yesterday -> R.string.yesterday
is TodayAndYesterday -> R.string.yesterday_and_today
is CurrentWeek -> R.string.current_week
is CurrentMonth -> R.string.current_month
is CurrentYear -> R.string.current_year
is PastDays -> R.string.period_in_days is PastDays -> R.string.period_in_days
*/ */

Loading…
Cancel
Save