Added convenience methods + cleanup

dev
Laurent 7 years ago
parent ecf975c916
commit 00b91bdf93
  1. 18
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  2. 14
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt

@ -450,6 +450,24 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
return this.bbNet / this.hourlyDuration return this.bbNet / this.hourlyDuration
} }
val isLive: Boolean
get() {
this.bankroll?.let {
return it.live
}
return true // default should be true
}
val hasBuyin: Boolean
get() {
return this.result?.buyin != null
}
val hasNetResult: Boolean
get() {
return this.result?.netResult != null
}
// Manageable // Manageable
override fun isValidForSave(): Boolean { override fun isValidForSave(): Boolean {

@ -92,17 +92,13 @@ enum class SessionRow : RowRepresentable {
return arrayListOf(GAME, BLINDS, LOCATION, BANKROLL, TABLE_SIZE, START_DATE, END_DATE) return arrayListOf(GAME, BLINDS, LOCATION, BANKROLL, TABLE_SIZE, START_DATE, END_DATE)
} }
SessionState.STARTED, SessionState.PAUSED, SessionState.FINISHED -> { SessionState.STARTED, SessionState.PAUSED, SessionState.FINISHED -> {
val liveBankroll = session.bankroll?.live ?: false
val fields = mutableListOf<RowRepresentable>() val fields = mutableListOf<RowRepresentable>()
if (session.result?.buyin != null) { // fill with what's used when {
fields.addAll(listOf(CASHED_OUT, BUY_IN, TIPS)) session.hasBuyin -> fields.addAll(listOf(CASHED_OUT, BUY_IN, TIPS))
} else if (session.result?.netResult != null) { session.hasNetResult -> fields.add(NET_RESULT)
fields.add(NET_RESULT) session.isLive -> fields.addAll(listOf(CASHED_OUT, BUY_IN, TIPS))
} else if (liveBankroll) { else -> fields.add(NET_RESULT)
fields.addAll(listOf(CASHED_OUT, BUY_IN, TIPS))
} else {
fields.add(NET_RESULT)
} }
fields.add(SeparatorRow()) fields.add(SeparatorRow())
fields.addAll(listOf( fields.addAll(listOf(

Loading…
Cancel
Save