From 2d87076a48e4e631017f29e780a8fcd8164d00d8 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sun, 20 Mar 2016 08:19:57 -0400 Subject: [PATCH] Change the way score are grouped --- .../java/org/isoron/uhabits/unit/models/ScoreListTest.java | 2 +- app/src/main/java/org/isoron/uhabits/models/ScoreList.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java index f9b85b083..350ce4676 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java @@ -124,7 +124,7 @@ public class ScoreListTest { toggleRepetitions(0, 20); - int expectedValues[] = { 12629351, 11006461, 7272612, 2800230 }; + int expectedValues[] = { 11434978, 7894999, 3212362 }; int actualValues[] = habit.scores.getAllValues(7); assertThat(actualValues, equalTo(expectedValues)); diff --git a/app/src/main/java/org/isoron/uhabits/models/ScoreList.java b/app/src/main/java/org/isoron/uhabits/models/ScoreList.java index f432151fb..1a267c301 100644 --- a/app/src/main/java/org/isoron/uhabits/models/ScoreList.java +++ b/app/src/main/java/org/isoron/uhabits/models/ScoreList.java @@ -218,7 +218,7 @@ public class ScoreList compute(from, to); divisor *= DateHelper.millisecondsInOneDay; - Long offset = to + divisor - 1; + Long offset = to + divisor; String query = "select ((timestamp - ?) / ?) as time, avg(score) from Score " + "where habit = ? and timestamp >= ? and timestamp <= ? " +