From dcc3113fe600891521de1663de85e7b41a7d70df Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Thu, 18 Apr 2019 15:25:05 +0200
Subject: [PATCH] Fixing crash due to refactoring

---
 .../main/java/net/pokeranalytics/android/calculus/Calculator.kt | 2 ++
 app/src/main/java/net/pokeranalytics/android/calculus/Report.kt | 2 +-
 .../net/pokeranalytics/android/ui/fragment/GraphFragment.kt     | 2 +-
 .../net/pokeranalytics/android/ui/fragment/StatsFragment.kt     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
index 6e7ec548..79887e01 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -97,11 +97,13 @@ class Calculator {
 
 		fun computeStatsWithEvolutionByAggregationType(
 			realm: Realm,
+			stat: Stat,
 			group: ComputableGroup,
 			aggregationType: AggregationType
 		): Report {
 
 			val options = Options(evolutionValues = Options.EvolutionValues.STANDARD, aggregationType = aggregationType)
+			options.displayedStats = listOf(stat)
 			if (aggregationType == AggregationType.DURATION) {
 				options.evolutionValues = Options.EvolutionValues.TIMED
 			}
diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
index 1ab9e794..6ffaa8ad 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
@@ -388,7 +388,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu
 	override val entryTitle: String = this.group.name
 
 	override fun formattedValue(stat: Stat, context: Context): TextFormat {
-		this.computedStat(stat)?.secondValue?.let {
+		this.computedStat(stat)?.progressValue?.let {
 			return stat.format(it, context = context)
 //			return it.format(context)
 		} ?: run {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
index e0314d6a..f2e1abc0 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
@@ -147,7 +147,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co
 				val realm = Realm.getDefaultInstance()
 
 				val report =
-					Calculator.computeStatsWithEvolutionByAggregationType(realm, computableGroup, aggregationType)
+					Calculator.computeStatsWithEvolutionByAggregationType(realm, stat, computableGroup, aggregationType)
 				reports[aggregationType] = report
 
 				r = report
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
index 0ffd0696..2d28347e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
@@ -247,7 +247,7 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc
 				val realm = Realm.getDefaultInstance()
 
 				val aggregationType = stat.aggregationTypes.first()
-				report = Calculator.computeStatsWithEvolutionByAggregationType(realm, computableGroup, aggregationType)
+				report = Calculator.computeStatsWithEvolutionByAggregationType(realm, stat, computableGroup, aggregationType)
 
 				realm.close()