Fixes issue where custom comparison did not show multi lines view

split
Laurent 5 years ago
parent c460acd631
commit 1d4f5d367f
  1. 10
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 1
      app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt

@ -59,7 +59,7 @@ class Calculator {
*/ */
var progressValues: ProgressValues = progressValues var progressValues: ProgressValues = progressValues
get() { get() {
if (field == ProgressValues.NONE && this.display == Display.PROGRESS) { if (field == ProgressValues.NONE && this.display.requireProgressValues) {
return ProgressValues.STANDARD return ProgressValues.STANDARD
} }
return field return field
@ -99,6 +99,14 @@ class Calculator {
else -> throw PAIllegalStateException("undefined activity for report display") else -> throw PAIllegalStateException("undefined activity for report display")
} }
} }
val requireProgressValues: Boolean
get() {
return when (this) {
PROGRESS, COMPARISON -> true
else -> false
}
}
} }
/** /**

@ -79,6 +79,7 @@ open class ReportSetup : RealmObject(), RowRepresentable, Deletable {
allCriteria.addAll(criteria) allCriteria.addAll(criteria)
allCriteria.addAll(cfCriteria) allCriteria.addAll(cfCriteria)
return Calculator.Options( return Calculator.Options(
display = Calculator.Options.Display.values()[this.display], display = Calculator.Options.Display.values()[this.display],
stats = stats, stats = stats,

Loading…
Cancel
Save