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

BarChart: allow user to pick interval

Browse Source
This commit is contained in:
Alinson S. Xavier
2018-06-15 21:11:47 -05:00
parent 6ad302b697
commit 6ca4877f1f
5 changed files with 100 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
View File

@@ -349,6 +349,12 @@ public abstract class CheckmarkList
add(buildCheckmarksFromIntervals(reps, intervals));
}
public List<Checkmark> getAll() {
Repetition oldest = habit.getRepetitions().getOldest();
if(oldest == null) return new ArrayList<>();
return getByInterval(oldest.getTimestamp(), DateUtils.getToday());
}
static final class Interval
{
final Timestamp begin;
@@ -408,9 +414,7 @@ public abstract class CheckmarkList
@NonNull
public List<Checkmark> groupBy(DateUtils.TruncateField field)
{
Repetition oldest = habit.getRepetitions().getOldest();
if(oldest == null) return new ArrayList<>();
List<Checkmark> checks = getByInterval(oldest.getTimestamp(), DateUtils.getToday());
List<Checkmark> checks = getAll();
int count = 0;
Timestamp truncatedTimestamps[] = new Timestamp[checks.size()];