add criteria for ValueCustomFields

fix issue with value custom fields and fix issue with labeling

app/src/main/java/net/pokeranalytics/android/model/Criteria.kt

@@ -16,6 +16,7 @@ import net.pokeranalytics.android.model.Criteria.TournamentFees.comparison
 import net.pokeranalytics.android.model.Criteria.TournamentNames.comparison
 import net.pokeranalytics.android.model.Criteria.TournamentTypes.comparison
 import net.pokeranalytics.android.model.Criteria.TransactionTypes.comparison
+import net.pokeranalytics.android.model.filter.FilterHelper
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.interfaces.NameManageable
@@ -23,7 +24,6 @@ import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.util.enumerations.IntIdentifiable
 import net.pokeranalytics.android.util.enumerations.IntSearchable
-import net.pokeranalytics.android.util.extensions.findById
 
 fun List<Criteria>.combined(): List<Query> {
 	val comparatorList = ArrayList<List<Query>>()

app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt

@@ -292,7 +292,7 @@ class Assistant {
 					is Criteria -> this.comparators.contains(row)
 					is CustomField -> {
 						val cfCriteria = this.comparators.filterIsInstance<CustomFieldCriteria>()
-						val cfCriterion = cfCriteria.firstOrNull { it.customField == row }
+						val cfCriterion = cfCriteria.firstOrNull { it.customFieldId == row.id }
 						return cfCriterion != null
 					}
 					else -> false