Merge branch 'dev' of gitlab.com:stax-river/poker-analytics into dev

app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt

@@ -3,6 +3,7 @@ package net.pokeranalytics.android.model.migrations
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
 import timber.log.Timber
+import java.util.*
 
 
 class PokerAnalyticsMigration : RealmMigration {
@@ -58,6 +59,10 @@ class PokerAnalyticsMigration : RealmMigration {
 
             schema.get("FilterCondition")?.let {
                 it.removeField("blindValues")
+                it.addField("operator", String::class.java).setNullable("operator", true)
+                it.addField("intValue", Int::class.java).setNullable("intValue", true)
+                it.addField("doubleValue", Double::class.java).setNullable("intValue", true)
+                it.addField("stringValue", String::class.java).setNullable("stringValue", true)
             }
 
 			schema.get("ComputableResult")?.let {

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

@@ -28,6 +28,7 @@ open class Result : RealmObject(), Filterable {
     var buyin: Double? = null
         set(value) {
             field = value
+            this.computeNumberOfRebuy()
             this.computeNet()
         }
 
@@ -85,6 +86,9 @@ open class Result : RealmObject(), Filterable {
     // The tournament final position, if applicable
     var tournamentFinalPosition: Int? = null
 
+    // Number of rebuys
+    //var numberOfRebuy: Double? = null
+
 	@LinkingObjects("result")
 	private val sessions: RealmResults<Session>? = null
 
@@ -117,6 +121,10 @@ open class Result : RealmObject(), Filterable {
 	    this.session?.sessionSet?.computeStats()
     }
 
+    // Computes the number of rebuy
+    private fun computeNumberOfRebuy() {
+    }
+
 	// @todo tips?
 
 }