Merge branch 'dev' of gitlab.com:stax-river/poker-analytics into dev

app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt

@@ -6,7 +6,11 @@ import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.model.realm.FilterCondition
 import net.pokeranalytics.android.model.realm.FilterElementBlind
 import net.pokeranalytics.android.model.realm.Session
+import java.time.*
 import java.util.*
+import java.time.temporal.TemporalQueries.zoneId
+
+
 
 
 /**
@@ -58,6 +62,12 @@ enum class QueryCondition(var operator: Operator? = null) {
     YEAR,
     WEEK_DAY,
     WEEK_END,
+    TODAY,
+    YESTERDAY,
+    TODAY_AND_YESTERDAY,
+    THIS_WEEK,
+    THIS_MONTH,
+    THIS_YEAR,
 
     CURRENCY,
     CURRENCY_CODE,
@@ -232,6 +242,9 @@ enum class QueryCondition(var operator: Operator? = null) {
 	                    }
 	                    query.`in`(fieldName, arrayOf(Calendar.SATURDAY, Calendar.SUNDAY))
                     }
+                    TODAY, YESTERDAY, TODAY_AND_YESTERDAY, THIS_WEEK, THIS_MONTH, THIS_YEAR -> {
+                        realmQuery
+                    }
                     else -> {
                         throw PokerAnalyticsException.QueryTypeUnhandled
                     }

app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt

@@ -79,16 +79,15 @@ sealed class FilterElementRow : RowRepresentable {
 				is Online -> QueryCondition.ONLINE
 				is Weekday -> QueryCondition.WEEK_DAY
 				is Weekend -> QueryCondition.WEEK_END
-
+				is Today -> QueryCondition.TODAY
-				/*
+				is Yesterday -> QueryCondition.YESTERDAY
-				is Today -> QueryCondition.
+				is TodayAndYesterday -> QueryCondition.TODAY_AND_YESTERDAY
-				is Yesterday -> R.string.yesterday
+				is CurrentWeek -> QueryCondition.THIS_WEEK
-				is TodayAndYesterday -> R.string.yesterday_and_today
+				is CurrentMonth -> QueryCondition.THIS_MONTH
-				is CurrentWeek -> R.string.current_week
+				is CurrentYear -> QueryCondition.THIS_YEAR
-				is CurrentMonth -> R.string.current_month
+                /*
-				is CurrentYear -> R.string.current_year
+                is PastDays -> R.string.period_in_days
-				is PastDays -> R.string.period_in_days
+                */
-				*/
 
 				is Limit -> QueryCondition.LIMIT
 				is TableSize -> QueryCondition.TABLE_SIZE