fix issues with blinds

feature/top10
Razmig Sarkissian 7 years ago
parent 5b11883a4a
commit 4bab8f96d1
  1. 3
      app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
  2. 13
      app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt
  3. 7
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt
  4. 13
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt

@ -89,7 +89,8 @@ sealed class Criteria {
is Blinds -> { is Blinds -> {
val blinds = arrayListOf<QueryCondition.BLIND>() val blinds = arrayListOf<QueryCondition.BLIND>()
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
realm.where<Session>().distinct("blinds", "bankroll.currency.code").findAll().sort("cgSmallBlind", Sort.ASCENDING).map { val query = realm.where<Session>().distinct("blinds").findAll().sort("cgSmallBlind", Sort.ASCENDING)
query.map {
it.blinds?.let { stake -> it.blinds?.let { stake ->
blinds.add(QueryCondition.BLIND().apply { blinds.add(QueryCondition.BLIND().apply {
blind = stake blind = stake

@ -55,18 +55,7 @@ enum class Comparator {
TOURNAMENT -> listOf(QueryCondition.TOURNAMENT) TOURNAMENT -> listOf(QueryCondition.TOURNAMENT)
LIVE -> listOf(QueryCondition.LIVE) LIVE -> listOf(QueryCondition.LIVE)
ONLINE -> listOf(QueryCondition.ONLINE) ONLINE -> listOf(QueryCondition.ONLINE)
BLIND -> { BLIND -> Criteria.Blinds.queryConditions
val blinds = arrayListOf<QueryCondition.BLIND>()
val realm = Realm.getDefaultInstance()
realm.where<Session>().distinct("blinds", "bankroll.currency.code").findAll().sort("cgSmallBlind", Sort.ASCENDING).map {
it.blinds?.let { stake ->
blinds.add(QueryCondition.BLIND().apply { blind = stake
hasDefaultCurrency = it.hasDefaultCurrency })
}
}
realm.close()
blinds
}
BANKROLL -> Criteria.Bankrolls.queryConditions BANKROLL -> Criteria.Bankrolls.queryConditions
GAME -> Criteria.Games.queryConditions GAME -> Criteria.Games.queryConditions
TOURNAMENT_NAME-> Criteria.TournamentNames.queryConditions TOURNAMENT_NAME-> Criteria.TournamentNames.queryConditions

@ -60,11 +60,8 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In
) )
TOURNAMENT -> arrayListOf( TOURNAMENT -> arrayListOf(
TOURNAMENT_TYPE, TOURNAMENT_TYPE,
COMPLETION_PERCENTAGE, TOURNAMENT_NAME,
PLACE, TOURNAMENT_FEATURE
PLAYERS_COUNT,
TOURNAMENT_RE_BUY_COUNT,
BUY_IN
) )
ONLINE -> arrayListOf( ONLINE -> arrayListOf(
MULTI_TABLING MULTI_TABLING

@ -104,18 +104,7 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable {
SESSIONS -> arrayListOf(QueryCondition.LAST_GAMES(), QueryCondition.LAST_SESSIONS()) SESSIONS -> arrayListOf(QueryCondition.LAST_GAMES(), QueryCondition.LAST_SESSIONS())
// Cash // Cash
/* BLIND -> Criteria.Blinds.queryConditions
BLIND -> {
val blinds = arrayListOf<Blind>()
val realm = Realm.getDefaultInstance()
realm.where<Session>().distinct("blind", "bankroll.currency.code").findAll().sort("cgSmallBlind", Sort.ASCENDING).map {
it.blinds?.let { stake ->
blinds.add(Blind(stake, it.hasDefaultCurrency))
}
}
realm.close()
blinds
}*/
CASH_RE_BUY_COUNT -> arrayListOf( CASH_RE_BUY_COUNT -> arrayListOf(
QueryCondition.MAX_RE_BUY(), QueryCondition.MAX_RE_BUY(),
QueryCondition.MIN_RE_BUY() QueryCondition.MIN_RE_BUY()

Loading…
Cancel
Save