fix mistakes in method where i get month statistics

devpolant · Nov 5, 2015 · 68732b4 · 68732b4
1 parent 5cc42be
commit 68732b4
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/app/src/main/java/com/polant/projectsport/data/Database.java b/app/src/main/java/com/polant/projectsport/data/Database.java
@@ -162,10 +162,11 @@ private Cursor getRawMonthStatisticsItems(){
         int month = calendar.get(Calendar.MONTH);
         int year = calendar.get(Calendar.YEAR);
 
-        int monthFrom = month;
+        //int monthFrom = month;
         int yearFrom = year;
         if (month - 1 < 0){
-            monthFrom = 11;
+            //monthFrom = 11;
+            month = 11;
             yearFrom = --year;
         }
         else{
@@ -176,14 +177,15 @@ private Cursor getRawMonthStatisticsItems(){
         };
         String where = "(" + DAY + " >? AND " + MONTH + " >? AND " + YEAR + " >? AND " + YEAR + " <? ) OR ( " +
                 DAY + " >? AND " + MONTH + " >? AND " + YEAR + " =? ) OR ( " +
-                MONTH + "=? AND " + YEAR + "=? )";
-        String[] whereArgs = new String[] {
-                String.valueOf(day - 1), String.valueOf(monthFrom - 1), String.valueOf(yearFrom - 1), String.valueOf(yearFrom + 1),
+                MONTH + ">? AND " + YEAR + "=? )";
 
-                String.valueOf(day - 1), String.valueOf(monthFrom - 1), String.valueOf(year),
+         String[] whereArgs = new String[] {
+                 String.valueOf(day - 1), String.valueOf(month - 1), String.valueOf(yearFrom - 1), String.valueOf(yearFrom + 1),
 
-                String.valueOf(month), String.valueOf(year)
-        };
+                 String.valueOf(day - 1), String.valueOf(month - 1), String.valueOf(year),
+
+                 String.valueOf(month), String.valueOf(year)
+         };
         return sqLiteDatabase.query(TABLE_STATISTICS, projection, where, whereArgs, null, null, null);
     }