kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 09:11:11 +00:00
Code Issues Projects Releases Wiki Activity

Make it possible to disable chores/tasks/batteries due soon filters/highlighting (closes #1485)

Browse Source
This commit is contained in:
Bernd Bestel
2022-01-23 19:20:23 +01:00
parent 04a3069294
commit cf52e5ec96
11 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/BatteriesController.php
View File

@@ -94,7 +94,7 @@ class BatteriesController extends BaseController
{
$currentBattery->due_type = 'duetoday';
}
elseif ($currentBattery->next_estimated_charge_time <= date('Y-m-d H:i:s', strtotime('+' . $nextXDays . ' days')))
elseif ($nextXDays > 0 && $currentBattery->next_estimated_charge_time <= date('Y-m-d H:i:s', strtotime('+' . $nextXDays . ' days')))
{
$currentBattery->due_type = 'duesoon';
}

2
controllers/ChoresController.php
View File

@@ -108,7 +108,7 @@ class ChoresController extends BaseController
{
$currentChore->due_type = 'duetoday';
}
elseif ($currentChore->next_estimated_execution_time <= date('Y-m-d H:i:s', strtotime('+' . $nextXDays . ' days')))
elseif ($nextXDays > 0 && $currentChore->next_estimated_execution_time <= date('Y-m-d H:i:s', strtotime('+' . $nextXDays . ' days')))
{
$currentChore->due_type = 'duesoon';
}

2
controllers/TasksController.php
View File

@@ -28,7 +28,7 @@ class TasksController extends BaseController
{
$task->due_type = 'duetoday';
}
elseif ($task->due_date <= date('Y-m-d 23:59:59', strtotime('+' . $nextXDays . ' days')))
elseif ($nextXDays > 0 && $task->due_date <= date('Y-m-d 23:59:59', strtotime('+' . $nextXDays . ' days')))
{
$task->due_type = 'duesoon';
}