isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change the way score are grouped

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-03-20 08:19:57 -04:00
parent 7da4ddf91b
commit 2d87076a48
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java
View File

@@ -124,7 +124,7 @@ public class ScoreListTest
{ {
toggleRepetitions(0, 20); toggleRepetitions(0, 20);
int expectedValues[] = { 12629351, 11006461, 7272612, 2800230 }; int expectedValues[] = { 11434978, 7894999, 3212362 };
int actualValues[] = habit.scores.getAllValues(7); int actualValues[] = habit.scores.getAllValues(7);
assertThat(actualValues, equalTo(expectedValues)); assertThat(actualValues, equalTo(expectedValues));

2
app/src/main/java/org/isoron/uhabits/models/ScoreList.java
View File

@@ -218,7 +218,7 @@ public class ScoreList
compute(from, to); compute(from, to);
divisor *= DateHelper.millisecondsInOneDay; divisor *= DateHelper.millisecondsInOneDay;
Long offset = to + divisor - 1; Long offset = to + divisor;
String query = "select ((timestamp - ?) / ?) as time, avg(score) from Score " + String query = "select ((timestamp - ?) / ?) as time, avg(score) from Score " +
"where habit = ? and timestamp >= ? and timestamp <= ? " + "where habit = ? and timestamp >= ? and timestamp <= ? " +