feature/top10
Razmig Sarkissian 7 years ago
parent 179ca0321e
commit 94d7447e40
  1. 2
      app/src/main/java/net/pokeranalytics/android/model/filter/DateFilterable.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/model/filter/SessionFilterable.kt
  3. 4
      app/src/main/java/net/pokeranalytics/android/model/filter/interfaces/ValueFilterable.kt

@ -27,7 +27,7 @@ enum class DateFilterable : Filterable {
override var valueMap : Map<String, Any?>? = null override var valueMap : Map<String, Any?>? = null
override val filterValuesExceptedKeys : Array<String>? override val filterValuesExpectedKeys : Array<String>?
get() { get() {
return when (this) { return when (this) {
STARTED_FROM_DATE, STARTED_TO_DATE, ENDED_FROM_DATE, ENDED_TO_DATE -> arrayOf("date") STARTED_FROM_DATE, STARTED_TO_DATE, ENDED_FROM_DATE, ENDED_TO_DATE -> arrayOf("date")

@ -67,7 +67,7 @@ enum class SessionFilterable(private var fieldName:String? = null, private var s
override var valueMap : Map<String, Any?>? = null override var valueMap : Map<String, Any?>? = null
override val filterValuesExceptedKeys : Array<String>? override val filterValuesExpectedKeys : Array<String>?
get() { get() {
this.subType?.let { this.subType?.let {
return when (it) { return when (it) {

@ -8,7 +8,7 @@ interface ValueFilterable {
var filterValues : Map<String, Any?>? var filterValues : Map<String, Any?>?
get() { get() {
this.filterValuesExceptedKeys?.let { valueMapExceptedKeys -> this.filterValuesExpectedKeys?.let { valueMapExceptedKeys ->
valueMap?.let { map -> valueMap?.let { map ->
var missingKeys = map.keys.filter { !valueMapExceptedKeys.contains(it) } var missingKeys = map.keys.filter { !valueMapExceptedKeys.contains(it) }
if (map.keys.size == valueMapExceptedKeys.size && missingKeys.isNotEmpty()) { if (map.keys.size == valueMapExceptedKeys.size && missingKeys.isNotEmpty()) {
@ -24,5 +24,5 @@ interface ValueFilterable {
valueMap = value valueMap = value
} }
val filterValuesExceptedKeys : Array<String>? val filterValuesExpectedKeys : Array<String>?
} }
Loading…
Cancel
Save