|
|
|
|
@ -48,9 +48,7 @@ class Report(var options: Calculator.Options) { |
|
|
|
|
|
|
|
|
|
statToUse?.let { |
|
|
|
|
this._results.forEachIndexed { index, results -> |
|
|
|
|
val stat = results.computedStat(it) |
|
|
|
|
val progressValue = stat?.progressValue |
|
|
|
|
progressValue?.let { progressValue -> |
|
|
|
|
results.computedStat(it)?.progressValue?.let { progressValue -> |
|
|
|
|
entries.add(Entry(index.toFloat(), progressValue.toFloat(), results)) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -73,7 +71,7 @@ class Report(var options: Calculator.Options) { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
val label = statToUse?.name ?: "" |
|
|
|
|
val label = statToUse?.name ?: "" |
|
|
|
|
return DataSetFactory.barDataSetInstance(entries, label, context) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -180,7 +178,8 @@ class ComputableGroup(name: String = "", conditions: List<QueryCondition> = list |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValues: Boolean = false) : GraphUnderlyingEntry { |
|
|
|
|
class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValues: Boolean = false) : |
|
|
|
|
GraphUnderlyingEntry { |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* The session group used to computed the stats |
|
|
|
|
@ -256,7 +255,8 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu |
|
|
|
|
val previousValue = previousComputedStat.progressValue ?: 0.0 |
|
|
|
|
computedStat.progressValue = previousValue + computedStat.value |
|
|
|
|
} |
|
|
|
|
else -> {} |
|
|
|
|
else -> { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} ?: run { |
|
|
|
|
computedStat.progressValue = computedStat.value |
|
|
|
|
@ -328,7 +328,8 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu |
|
|
|
|
computedStat.progressValue = Stat.returnOnInvestment(netResult, totalBuyin) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
else -> {} |
|
|
|
|
else -> { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|