krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6483 from HabitRPG/new-history-preening

Browse Source 
fixes for new history preening, allow only 1 history entry per day in…
This commit is contained in:
Matteo Pagliazzi
2016-01-09 21:03:18 +01:00
parent be0fe3eb4f b1a7e44722
commit f55e4f65f9
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/script/preenUserHistory.js
View File

@@ -50,8 +50,8 @@ export function preenHistory (history, isSubscribed, timezoneOffset) {
return date.isSame(monthsCutOff) || date.isAfter(monthsCutOff);
});
// Aggregate remaining entries by month and year
newHistory.unshift(..._aggregate(aggregateByMonth, 'YYYYMM'));
newHistory.unshift(..._aggregate(history, 'YYYY'));
if (history.length > 0) newHistory.unshift(..._aggregate(aggregateByMonth, 'YYYYMM'));
if (history.length > 0) newHistory.unshift(..._aggregate(history, 'YYYY'));
return newHistory;
}