merge

app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt

@@ -49,7 +49,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         blind.filterSectionRow = FilterSectionRow.BLIND
 
         val filterElement = FilterCondition(filterElementRows = arrayListOf(blind))
-        filter.updateValueMap(filterElement)
+        filter.updateValueBy(filterElement)
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -100,7 +100,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         blind2.filterSectionRow = FilterSectionRow.BLIND
 
         val filterElements = FilterCondition(filterElementRows = arrayListOf(blind1, blind2))
-        filter.updateValueMap(filterElements)
+        filter.updateValueBy(filterElements)
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -148,7 +148,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         blind.filterSectionRow = FilterSectionRow.BLIND
 
         val filterElement = FilterCondition(filterElementRows = arrayListOf(blind))
-        filter.updateValueMap(filterElement)
+        filter.updateValueBy(filterElement)
         println("<<<< ${filter.listOfValues}")
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -200,7 +200,7 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         blind2.filterSectionRow = FilterSectionRow.BLIND
 
         val filterElement = FilterCondition(filterElementRows = arrayListOf(blind1, blind2))
-        filter.updateValueMap(filterElement)
+        filter.updateValueBy(filterElement)
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 

app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt

@@ -35,7 +35,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filterElementRow = QueryCondition.AnyDayOfWeek().apply { listOfValues = arrayListOf(cal.get(Calendar.DAY_OF_WEEK)) }
         filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE
         val filterElement = FilterCondition(arrayListOf(filterElementRow))
-        filter.updateValueMap(filterElement)
+        filter.updateValueBy(filterElement)
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -64,7 +64,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
 
         filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE
         val filterElement = FilterCondition(arrayListOf(filterElementRow))
-        filter.updateValueMap(filterElement)
+        filter.updateValueBy(filterElement)
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -92,7 +92,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filterElementRow = QueryCondition.AnyYear().apply { listOfValues = arrayListOf(cal.get(Calendar.YEAR)) }
         filterElementRow.filterSectionRow = FilterSectionRow.DYNAMIC_DATE
         val filterElement = FilterCondition(arrayListOf(filterElementRow))
-        filter.updateValueMap(filterElement)
+        filter.updateValueBy(filterElement)
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -385,7 +385,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.StartedFromDate()
         val filterElementRow = QueryCondition.StartedFromDate().apply { singleValue = s2.startDate!!}
         filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE
-        filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -413,7 +413,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.StartedToDate()
         val filterElementRow = QueryCondition.StartedToDate().apply { singleValue = s1.startDate!! }
         filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE
-        filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -442,7 +442,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.EndedFromDate()
         val filterElementRow = QueryCondition.EndedFromDate().apply { singleValue = s2.endDate() }
         filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE
-        filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -471,7 +471,7 @@ class DateFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.EndedToDate()
         val filterElementRow = QueryCondition.EndedToDate().apply { singleValue = s1.endDate() }
         filterElementRow.filterSectionRow = FilterSectionRow.FIXED_DATE
-        filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 

app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt

@@ -110,7 +110,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.AnyBankroll()
         val filterElementRow = QueryCondition.AnyBankroll().apply { setObject(b1) }
         filterElementRow.filterSectionRow = FilterSectionRow.BANKROLL
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -144,7 +144,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
 
         val filterElementRow2 = QueryCondition.AnyBankroll().apply { setObject(b2) }
         filterElementRow2.filterSectionRow = FilterSectionRow.BANKROLL
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -225,7 +225,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.AnyLocation()
         val filterElementRow = QueryCondition.AnyLocation().apply { setObject(l1) }
         filterElementRow.filterSectionRow = FilterSectionRow.LOCATION
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -260,7 +260,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filterElementRow2 = QueryCondition.AnyLocation().apply { setObject(l3) }
         filterElementRow2.filterSectionRow = FilterSectionRow.LOCATION
 
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -287,7 +287,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
 
         val filterElementRow = QueryCondition.AnyTournamentName().apply { setObject(t1) }
         filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -320,7 +320,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME
         val filterElementRow2 = QueryCondition.AnyTournamentName().apply { setObject(t2) }
         filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_NAME
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -358,7 +358,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         filterElementRow2.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE
         val filterElementRow3 = QueryCondition.AllTournamentFeature().apply { setObject(t4) }
         filterElementRow3.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -395,7 +395,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         filterElementRow3.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE
         val filterElementRow4 = QueryCondition.AnyTournamentFeature().apply { setObject(t4) }
         filterElementRow4.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3, filterElementRow4)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2, filterElementRow3, filterElementRow4)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -423,7 +423,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.AnyTournamentFeature()
         val filterElementRow = QueryCondition.AnyTournamentFeature().apply { setObject(t2) }
         filterElementRow.filterSectionRow = FilterSectionRow.TOURNAMENT_FEATURE
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -450,7 +450,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         filterElementRow.filterSectionRow = FilterSectionRow.TABLE_SIZE
         val filterElementRow2 = QueryCondition.AnyTableSize().apply { listOfValues = arrayListOf(4) }
         filterElementRow.filterSectionRow = FilterSectionRow.TABLE_SIZE
-        filter.updateValueMap(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
+        filter.updateValueBy(FilterCondition(filterElementRows = arrayListOf(filterElementRow, filterElementRow2)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -475,7 +475,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.NetAmountWon()
         val filterElementRow = QueryCondition.more<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(204.0) }
         filterElementRow.filterSectionRow = FilterSectionRow.VALUE
-        filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filterElementRow))
 
@@ -500,7 +500,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filter = QueryCondition.NetAmountWon()
         val filterElementRow = QueryCondition.less<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(540.0) }
         filterElementRow.filterSectionRow = FilterSectionRow.VALUE
-        filter.updateValueMap(FilterCondition(arrayListOf(filterElementRow)))
+        filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filter))
 
@@ -525,12 +525,12 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val filterMore = QueryCondition.NetAmountWon()
         val filterElementRow = QueryCondition.more<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(200.0) }
         filterElementRow.filterSectionRow = FilterSectionRow.VALUE
-        filterMore.updateValueMap(FilterCondition(arrayListOf(filterElementRow)))
+        filterMore.updateValueBy(FilterCondition(arrayListOf(filterElementRow)))
 
         val filterLess = QueryCondition.NetAmountWon()
         val filterElementRow2 = QueryCondition.less<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(400.0) }
         filterElementRow2.filterSectionRow = FilterSectionRow.VALUE
-        filterLess.updateValueMap(FilterCondition(arrayListOf(filterElementRow2)))
+        filterLess.updateValueBy(FilterCondition(arrayListOf(filterElementRow2)))
 
         val sessions = Filter.queryOn<Session>(realm, arrayListOf(filterMore, filterLess))
 
@@ -573,4 +573,44 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
             Assert.assertTrue(result.contains((it as Session).id))
         }
     }
+
+    @Test
+    fun testTournamentFinalPosition() {
+        val realm = this.mockRealm
+        realm.beginTransaction()
+        val s1 = Session.testInstance(netResult = 200.0, isTournament = true)
+        s1.result!!.tournamentFinalPosition = 5
+
+        val s2 = Session.testInstance(netResult = 50.0, isTournament = true)
+        s2.result!!.tournamentFinalPosition = 15
+
+        val s3 = Session.testInstance(netResult = 500.0, isTournament = true)
+        s3.result!!.tournamentFinalPosition = 2
+
+        val s4 = Session.testInstance(netResult = 570.0, isTournament = true)
+        s4.result!!.tournamentFinalPosition = 1
+        realm.commitTransaction()
+
+        val filterLess = QueryCondition.TournamentFinalPosition(QueryCondition.Operator.LESS, finalPosition = 1)
+        var sessions = Filter.queryOn<Session>(realm, arrayListOf(filterLess))
+
+        Assert.assertEquals(1, sessions.size)
+
+        var result = arrayListOf(s4.id)
+        sessions.forEach {
+            Assert.assertTrue(result.contains((it as Session).id))
+        }
+
+
+        val filterMore = QueryCondition.TournamentFinalPosition(QueryCondition.Operator.MORE, finalPosition = 10)
+        sessions = Filter.queryOn<Session>(realm, arrayListOf(filterMore))
+
+        Assert.assertEquals(1, sessions.size)
+
+        result = arrayListOf(s2.id)
+        sessions.forEach {
+            Assert.assertTrue(result.contains((it as Session).id))
+        }
+
+    }
 }

app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt

@@ -129,8 +129,8 @@ sealed class QueryCondition : FilterElementRow {
         open var sign: Int = 1
 
         override var listOfValues = arrayListOf(0.0)
-        override fun updateValueMap(filterCondition: FilterCondition) {
-            super.updateValueMap(filterCondition)
+        override fun updateValueBy(filterCondition: FilterCondition) {
+            super.updateValueBy(filterCondition)
             listOfValues = filterCondition.getValues()
         }
         override fun labelForValue(value: Double): String {
@@ -140,9 +140,8 @@ sealed class QueryCondition : FilterElementRow {
 
     abstract class ListOfInt: ListOfValues<Int>() {
         override var listOfValues = arrayListOf(0)
-        override fun updateValueMap(filterCondition: FilterCondition) {
-            super.updateValueMap(filterCondition)
-            println("<<<< updateValueMap ${filterCondition.intValues}")
+        override fun updateValueBy(filterCondition: FilterCondition) {
+            super.updateValueBy(filterCondition)
             listOfValues = filterCondition.getValues()
         }
         override fun labelForValue(value: Int): String {
@@ -153,8 +152,8 @@ sealed class QueryCondition : FilterElementRow {
     abstract class ListOfString: ListOfValues<String>() {
         override var listOfValues = ArrayList<String>()
         override fun labelForValue(value: String): String { return value }
-        override fun updateValueMap(filterCondition: FilterCondition) {
-            super.updateValueMap(filterCondition)
+        override fun updateValueBy(filterCondition: FilterCondition) {
+            super.updateValueBy(filterCondition)
             listOfValues = filterCondition.getValues()
         }
     }
@@ -168,8 +167,8 @@ sealed class QueryCondition : FilterElementRow {
             get() { return listOfValues.firstOrNull() ?: Date() }
             set(value) { listOfValues.add(value) }
 
-        override fun updateValueMap(filterCondition: FilterCondition) {
-            super.updateValueMap(filterCondition)
+        override fun updateValueBy(filterCondition: FilterCondition) {
+            super.updateValueBy(filterCondition)
             singleValue = filterCondition.getValue()
         }
     }
@@ -182,8 +181,8 @@ sealed class QueryCondition : FilterElementRow {
             get() { return listOfValues.firstOrNull() ?: 0 }
             set(value) { listOfValues.add(value) }
 
-        override fun updateValueMap(filterCondition: FilterCondition) {
-            super.updateValueMap(filterCondition)
+        override fun updateValueBy(filterCondition: FilterCondition) {
+            super.updateValueBy(filterCondition)
             singleValue = filterCondition.getValue()
         }
     }
@@ -319,7 +318,14 @@ sealed class QueryCondition : FilterElementRow {
     class NumberOfRebuy(): ListOfDouble() {
         constructor(operator: Operator, numberOfRebuy: Double) : this() {
             this.operator = operator
-            listOfValues = arrayListOf(numberOfRebuy)
+            this.listOfValues = arrayListOf(numberOfRebuy)
+        }
+    }
+
+    open class TournamentFinalPosition(): ListOfInt() {
+        constructor(operator: Operator, finalPosition: Int) : this() {
+            this.operator = operator
+            this.listOfValues = arrayListOf(finalPosition)
         }
     }
 
@@ -327,7 +333,7 @@ sealed class QueryCondition : FilterElementRow {
     class NetAmountWon: NetAmount()
     class NetAmountLost: NetAmount() { override var sign: Int = -1 }
 
-    class NumberOfPlayer: ListOfInt()
+    class TournamentNumberOfPlayer: ListOfInt()
 
     class StartedFromDate: DateQuery() { override var operator = Operator.MORE }
     class StartedToDate: DateQuery() { override var operator = Operator.LESS }
@@ -522,7 +528,7 @@ sealed class QueryCondition : FilterElementRow {
         }
     }
 
-    open fun updateValueMap(filterCondition: FilterCondition) {
+    open fun updateValueBy(filterCondition: FilterCondition) {
         filterCondition.operator?.let {
             this.operator = Operator.values()[it]
         }

app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt

@@ -114,7 +114,7 @@ open class Filter : RealmObject() {
 			it.queryCondition.id == filterElementRow.id
 		}
 		if (filtered.isNotEmpty()) {
-            return filterElementRow.updateValueMap(filtered.first())
+            return filterElementRow.updateValueBy(filtered.first())
 		}
 	}
 

app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt

@@ -33,7 +33,7 @@ open class FilterCondition() : RealmObject() {
     val queryCondition : QueryCondition
         get() = QueryCondition.valueOf<QueryCondition>(this.filterName ?: throw PokerAnalyticsException.FilterElementUnknownName)
             .apply {
-                this.updateValueMap(this@FilterCondition)
+                this.updateValueBy(this@FilterCondition)
             }
 
     var doubleValues: RealmList<Double>? = null

app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt

@@ -79,7 +79,8 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
                 NumberOfTable::class.java -> "numberOfTable"
                 NetAmount::class.java -> "computableResults.ratedNet"
                 NumberOfRebuy::class.java -> "result.numberOfRebuy"
-                NumberOfPlayer::class.java -> "result.tournamentNumberOfPlayers"
+                TournamentNumberOfPlayer::class.java -> "result.tournamentNumberOfPlayers"
+                TournamentFinalPosition::class.java -> "result.tournamentFinalPosition"
                 TournamentFee::class.java -> "tournamentEntryFee"
                 StartedFromDate::class.java, StartedToDate::class.java -> "startDate"
                 EndedFromDate::class.java, EndedToDate::class.java -> "endDate"

app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt

@@ -14,10 +14,10 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In
 	TOURNAMENT(R.string.tournament),
 	ONLINE(R.string.online),
 	RESULT(R.string.result),
-	TRANSACTION_TYPES(R.string.operation_types),
+	//TRANSACTION_TYPES(R.string.operation_types),
 	LOCATIONS(R.string.locations),
 	BANKROLLS(R.string.bankrolls),
-	PLAYERS(R.string.players),
+	//PLAYERS(R.string.players),
 	;
 
 	val filterElements: List<RowRepresentable>
@@ -61,8 +61,9 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In
 					TOURNAMENT_TYPE,
                     TOURNAMENT_NAME,
                     TOURNAMENT_FEATURE,
-                    ENTRY_FEE,
-                    NUMBER_OF_PLAYERS
+                    TOURNAMENT_ENTRY_FEE,
+                    TOURNAMENT_NUMBER_OF_PLAYER,
+                    TOURNAMENT_FINAL_POSITION
 				)
 				ONLINE -> arrayListOf(
 					MULTI_TABLING
@@ -70,15 +71,13 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In
 				LOCATIONS -> arrayListOf(
 					LOCATION
 				)
-				PLAYERS -> arrayListOf(
-					MULTI_PLAYER
-				)
+                //PLAYERS -> arrayListOf(MULTI_PLAYER)
 				RESULT -> arrayListOf(
 					VALUE,
                     NUMBER_OF_REBUY
 				)
 
-				TRANSACTION_TYPES -> arrayListOf()
+				//TRANSACTION_TYPES -> arrayListOf()
 			}
 		}
 }

app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt

@@ -29,10 +29,10 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable {
 	TOURNAMENT_NAME(R.string.tournament_name),
 	TOURNAMENT_FEATURE(R.string.tournament_feature),
 	COMPLETION_PERCENTAGE(R.string.tournament_completion_percentage_interval),
-	PLACE(R.string.final_position),
-	PLAYERS_COUNT(R.string.players_count),
+	TOURNAMENT_FINAL_POSITION(R.string.final_position),
+	TOURNAMENT_NUMBER_OF_PLAYER(R.string.players_count),
 	TOURNAMENT_RE_BUY_COUNT(R.string.rebuy_count),
-	ENTRY_FEE(R.string.buyin),
+	TOURNAMENT_ENTRY_FEE(R.string.buyin),
 	MULTI_TABLING(R.string.number_of_tables),
 	VALUE(R.string.value),
 	LOCATION(R.string.locations),
@@ -95,17 +95,16 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable {
 						// Tournament
 						TOURNAMENT_TYPE -> Criteria.TournamentTypes.queryConditions.mapFirstCondition()
 //						COMPLETION_PERCENTAGE ->  arrayListOf()
-						//PLACE -> QueryCondition.moreOrLess<QueryCondition.TournamentFinalPosition>()
-						PLAYERS_COUNT -> QueryCondition.moreOrLess<QueryCondition.NumberOfPlayer>()
-//						TOURNAMENT_RE_BUY_COUNT -> QueryCondition.moreOrLess<QueryCondition.BuyIn>()
-						ENTRY_FEE -> Criteria.TournamentFees.queryConditions.mapFirstCondition()
 
+						TOURNAMENT_FINAL_POSITION -> QueryCondition.moreOrLess<QueryCondition.TournamentFinalPosition>()
+						TOURNAMENT_NUMBER_OF_PLAYER -> QueryCondition.moreOrLess<QueryCondition.TournamentNumberOfPlayer>()
+						TOURNAMENT_ENTRY_FEE -> Criteria.TournamentFees.queryConditions.mapFirstCondition()
 						TOURNAMENT_NAME -> Criteria.TournamentNames.queryConditions.mapFirstCondition()
 						TOURNAMENT_FEATURE -> Criteria.TournamentFeatures.queryConditions.mapFirstCondition()
 						LOCATION -> Criteria.Locations.queryConditions.mapFirstCondition()
 						BANKROLL -> Criteria.Bankrolls.queryConditions.mapFirstCondition()
 						MULTI_TABLING -> QueryCondition.moreOrLess<QueryCondition.NumberOfTable>()
-						NUMBER_OF_PLAYERS -> QueryCondition.moreOrLess<QueryCondition.NumberOfPlayer>()
+						//NUMBER_OF_PLAYERS -> QueryCondition.moreOrLess<QueryCondition.TournamentNumberOfPlayer>()
                         NUMBER_OF_REBUY -> QueryCondition.moreOrLess<QueryCondition.NumberOfRebuy>()
 //						MULTI_PLAYER -> arrayListOf()