Does not launch comparison report with less than 2 groups

feature/top10
Laurent 7 years ago
parent 36865f5d2f
commit 45a5894c95
  1. 9
      app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt
  2. 4
      app/src/main/res/layout/layout_legend_default.xml
  3. 1
      app/src/main/res/values/strings.xml

@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.Toast
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import io.realm.Realm import io.realm.Realm
import kotlinx.android.synthetic.main.fragment_stats.* import kotlinx.android.synthetic.main.fragment_stats.*
@ -14,6 +15,7 @@ import net.pokeranalytics.android.R
import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.Calculator
import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.calculus.Stat
import net.pokeranalytics.android.model.Criteria import net.pokeranalytics.android.model.Criteria
import net.pokeranalytics.android.model.combined
import net.pokeranalytics.android.ui.activity.ReportDetailsActivity import net.pokeranalytics.android.ui.activity.ReportDetailsActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
@ -105,6 +107,11 @@ class ReportsFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSour
*/ */
private fun launchComputation(criteria: List<Criteria>, reportName: String) { private fun launchComputation(criteria: List<Criteria>, reportName: String) {
if (criteria.combined().size < 2) {
Toast.makeText(context, R.string.less_then_2_values_for_comparison, Toast.LENGTH_LONG).show()
return
}
showLoader() showLoader()
GlobalScope.launch { GlobalScope.launch {
@ -114,6 +121,7 @@ class ReportsFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSour
val requiredStats: List<Stat> = listOf(Stat.NET_RESULT) val requiredStats: List<Stat> = listOf(Stat.NET_RESULT)
val options = Calculator.Options(evolutionValues = Calculator.Options.EvolutionValues.STANDARD, stats = requiredStats) val options = Calculator.Options(evolutionValues = Calculator.Options.EvolutionValues.STANDARD, stats = requiredStats)
val report = Calculator.computeStatsWithComparators(realm, criteria = criteria, options = options) val report = Calculator.computeStatsWithComparators(realm, criteria = criteria, options = options)
Timber.d("launchComputation: ${System.currentTimeMillis() - startDate.time}ms") Timber.d("launchComputation: ${System.currentTimeMillis() - startDate.time}ms")
@ -124,6 +132,7 @@ class ReportsFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSour
ReportDetailsActivity.newInstance(requireContext(), report, reportName) ReportDetailsActivity.newInstance(requireContext(), report, reportName)
} }
} }
realm.close()
} }
} }

@ -11,8 +11,8 @@
android:background="@color/green_header" android:background="@color/green_header"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/counter" app:layout_constraintBottom_toBottomOf="@+id/stat1Value"
android:layout_marginBottom="4dp" android:layout_marginBottom="0dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

@ -9,6 +9,7 @@
<string name="variant">Variant</string> <string name="variant">Variant</string>
<string name="line">Line</string> <string name="line">Line</string>
<string name="initial_value">Initial Value</string> <string name="initial_value">Initial Value</string>
<string name="less_then_2_values_for_comparison">There is less than two values to compare! Please change your habits :)</string>
<!--<string name="session_missing_end_date">Please set the end date for the session</string>--> <!--<string name="session_missing_end_date">Please set the end date for the session</string>-->
<!--<string name="default_error_message">Sorry, something went wrong...please contact us!</string>--> <!--<string name="default_error_message">Sorry, something went wrong...please contact us!</string>-->

Loading…
Cancel
Save