kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-16 10:44:37 +00:00
Code Issues Projects Releases Wiki Activity

Apply table filters on /tasks load (fixes #2660)

Browse Source
This commit is contained in:
Bernd Bestel
2025-01-31 16:33:55 +01:00
parent 56d8c2f13a
commit 11fdf5929a
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
public/viewjs/tasks.js
View File

@@ -199,20 +199,23 @@ function RefreshStatistics()
result.forEach(element =>
{
var date = moment(element.due_date + " 23:59:59").endOf("day");
if (element.due_date)
{
var date = moment(element.due_date + " 23:59:59").endOf("day");
if (date.isSameOrBefore(overdueThreshold))
{
overdueCount++;
}
else if (date.isSameOrBefore(todayThreshold))
{
dueTodayCount++;
dueSoonCount++;
}
else if (date.isSameOrBefore(nextXDaysThreshold))
{
dueSoonCount++;
if (date.isSameOrBefore(overdueThreshold))
{
overdueCount++;
}
else if (date.isSameOrBefore(todayThreshold))
{
dueTodayCount++;
dueSoonCount++;
}
else if (date.isSameOrBefore(nextXDaysThreshold))
{
dueSoonCount++;
}
}
});
@@ -228,3 +231,8 @@ function RefreshStatistics()
}
RefreshStatistics();
// Apply filters (there are maybe some set when a task was just edited)
$("#search").trigger("keyup");
$("#status-filter").trigger("change");
$("#category-filter").trigger("change");