Fixes issue with lack of data message

blinds
Laurent 5 years ago
parent 4624bfad24
commit da73975e6d
  1. 1
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 11
      app/src/main/java/net/pokeranalytics/android/calculus/ComputableGroup.kt
  3. 1
      app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
  4. 13
      app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.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()

@ -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

@ -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

@ -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)
}
}

Loading…
Cancel
Save