From da73975e6d6616893bc0a676bbe8fa3974e9bd20 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 1 Mar 2021 16:25:03 +0100
Subject: [PATCH] Fixes issue with lack of data message

---
 .../pokeranalytics/android/calculus/Calculator.kt   |  1 -
 .../android/calculus/ComputableGroup.kt             | 11 +++++++++++
 .../net/pokeranalytics/android/calculus/Report.kt   |  1 -
 .../report/ComposableTableReportFragment.kt         | 13 +++++++------
 4 files changed, 18 insertions(+), 8 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 07a00723..a8a2a2fc 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -202,7 +202,6 @@ class Calculator {
 
 			val report = Report(options)
 			groups.forEach { group ->
-				//				val s = Date()
 
 				// Clean existing computables / sessionSets if group is reused
 				group.cleanup()
diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/ComputableGroup.kt b/app/src/main/java/net/pokeranalytics/android/calculus/ComputableGroup.kt
index 5572a0aa..5cd8937d 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/ComputableGroup.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/ComputableGroup.kt
@@ -32,6 +32,11 @@ class ComputableGroup(var query: Query, var displayedStats: List<Stat>? = null)
 			return this.query.conditions
 		}
 
+	/**
+	 * The size of the retrieved computables list
+	 */
+	var size: Int = 0
+
 	/**
 	 * The list of endedSessions to compute
 	 */
@@ -51,7 +56,10 @@ class ComputableGroup(var query: Query, var displayedStats: List<Stat>? = null)
 
 		val sortedField = if (sorted) "session.startDate" else null
 		val computables = Filter.queryOn<ComputableResult>(realm, this.query, sortedField)
+
+		this.size = computables.size
 		this._computables = computables
+
 		return computables
 	}
 
@@ -77,6 +85,9 @@ class ComputableGroup(var query: Query, var displayedStats: List<Stat>? = null)
 		return sets
 	}
 
+	/**
+	 * Nullifies used Realm results
+	 */
 	fun cleanup() {
 		this._computables = null
 		this._sessionSets = null
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 dbdda615..9d9114c4 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
@@ -3,7 +3,6 @@ package net.pokeranalytics.android.calculus
 import android.content.Context
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.interfaces.GraphIdentifiableEntry
-import net.pokeranalytics.android.ui.fragment.GraphFragment
 import net.pokeranalytics.android.ui.graph.Graph
 import net.pokeranalytics.android.ui.graph.GraphUnderlyingEntry
 import net.pokeranalytics.android.ui.view.DefaultLegendValues
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt
index 3b8dcf07..937950a0 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt
@@ -187,12 +187,6 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab
 		}
 		this.hasComputationInProgress = true
 
-		val cr = getRealm().where(ComputableResult::class.java).findAll()
-		if (cr.size < 2) {
-			Toast.makeText(context, R.string.less_then_2_values_for_display, Toast.LENGTH_LONG).show()
-			return
-		}
-
 		if (row is StatRow && row.stat.hasProgressGraph) {
 
 			// queryWith groups
@@ -201,6 +195,13 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab
 			}
 
 			groupResults?.firstOrNull()?.let {
+
+				if (it.group.size < 2) {
+					Toast.makeText(context, R.string.less_then_2_values_for_display, Toast.LENGTH_LONG).show()
+					this.hasComputationInProgress = false
+					return
+				}
+
 				this.launchStatComputationWithEvolution(row.stat, it.group)
 			}
 		}