|
|
|
@ -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 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
|