From a371b44725672ab2c45fed34e6356232afefcc1c Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Fri, 19 Apr 2019 17:21:39 +0200
Subject: [PATCH] graphical update

---
 .../pokeranalytics/android/calculus/Calculator.kt |  2 +-
 .../android/model/filter/QueryCondition.kt        | 15 ++++++---------
 app/src/main/res/layout/fragment_evograph.xml     |  3 +--
 3 files changed, 8 insertions(+), 12 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 5e4de50f..cbb9a3e1 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -116,7 +116,7 @@ class Calculator {
 			return when (aggregationType) {
 				AggregationType.SESSION, AggregationType.DURATION -> this.computeGroups(realm, listOf(group), options)
 				AggregationType.MONTH -> {
-					val comparators: List<Comparator> = listOf(Comparator.YEAR, Comparator.MONTH_OF_YEAR)
+					val comparators: List<Comparator> = listOf(Comparator.MONTH_OF_YEAR, Comparator.YEAR)
 					this.computeStatsWithComparators(realm, comparators, group.conditions, options)
 				}
 				AggregationType.YEAR -> {
diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
index 86f7ad56..e53dd38a 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
@@ -1,23 +1,20 @@
 package net.pokeranalytics.android.model.filter
 
-import android.content.Context
-import io.realm.*
-import io.realm.kotlin.where
+import io.realm.Realm
 import io.realm.RealmQuery
-import io.realm.internal.Table
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.Stat
+import io.realm.RealmResults
+import io.realm.Sort
+import io.realm.kotlin.where
 import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.model.Limit
 import net.pokeranalytics.android.model.TableSize
 import net.pokeranalytics.android.model.TournamentType
 import net.pokeranalytics.android.model.interfaces.Identifiable
-import net.pokeranalytics.android.model.interfaces.Manageable
 import net.pokeranalytics.android.model.interfaces.NameManageable
 import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.extensions.endOfDay
 import net.pokeranalytics.android.util.extensions.startOfDay
@@ -26,7 +23,7 @@ import java.util.*
 import kotlin.collections.ArrayList
 
 fun List<QueryCondition>.name() : String {
-    return this.map { it.getDisplayName() }.joinToString(" / ")
+    return this.map { it.getDisplayName() }.joinToString(" : ")
 }
 
 //inline fun <reified T : Filterable> List<QueryCondition>.query(realm: Realm): RealmQuery<T> {
diff --git a/app/src/main/res/layout/fragment_evograph.xml b/app/src/main/res/layout/fragment_evograph.xml
index 8c937fd5..39d8185c 100644
--- a/app/src/main/res/layout/fragment_evograph.xml
+++ b/app/src/main/res/layout/fragment_evograph.xml
@@ -17,8 +17,7 @@
 		android:id="@+id/chartContainer"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginBottom="8dp"
+		android:layout_margin="8dp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"