mirror of
https://github.com/grocy/grocy.git
synced 2025-04-28 17:23:56 +00:00
Apply table filters on /tasks load (fixes #2660)
This commit is contained in:
parent
56d8c2f13a
commit
11fdf5929a
@ -36,7 +36,7 @@
|
||||
|
||||
### Tasks
|
||||
|
||||
- xxx
|
||||
- Fixed that set table filters were not applied after editing or adding a task
|
||||
|
||||
### Batteries
|
||||
|
||||
|
@ -299,22 +299,22 @@ RefreshContextualTimeago = function(rootSelector = "#page-content")
|
||||
|
||||
if (!element.hasAttr("datetime"))
|
||||
{
|
||||
element.text("")
|
||||
return
|
||||
element.text("");
|
||||
return;
|
||||
}
|
||||
|
||||
var timestamp = element.attr("datetime");
|
||||
|
||||
if (!timestamp || timestamp.length < 10)
|
||||
{
|
||||
element.text("")
|
||||
return
|
||||
element.text("");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!moment(timestamp).isValid())
|
||||
{
|
||||
element.text("")
|
||||
return
|
||||
element.text("");
|
||||
return;
|
||||
}
|
||||
|
||||
var isNever = timestamp && timestamp.substring(0, 10) == "2999-12-31";
|
||||
|
@ -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");
|
||||
|
Loading…
x
Reference in New Issue
Block a user