From 50e6d7c56564853be4128d2d51824e3e1e06884c Mon Sep 17 00:00:00 2001
From: fipwmaqzufheoxq92ebc
 <29818044+fipwmaqzufheoxq92ebc@users.noreply.github.com>
Date: Tue, 1 Sep 2020 17:46:12 +0200
Subject: [PATCH] Fix missing highlighting of "< X days"

---
 views/batteriesoverview.blade.php | 7 ++-----
 views/choresoverview.blade.php    | 7 ++-----
 views/stockentries.blade.php      | 4 +---
 views/stockoverview.blade.php     | 7 ++-----
 views/tasks.blade.php             | 3 +--
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php
index ed2d5fd6..2f021700 100644
--- a/views/batteriesoverview.blade.php
+++ b/views/batteriesoverview.blade.php
@@ -80,9 +80,7 @@
 			<tbody class="d-none">
 				@foreach($current as $currentBatteryEntry)
 				<tr id="battery-{{ $currentBatteryEntry->battery_id }}-row"
-					class="@if(FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->charge_interval_days > 0 && $currentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s')) table-danger @elseif(FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->charge_interval_days > 0 && $currentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s', strtotime("
-					+$nextXDays
-					days")))
+					class="@if(FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->charge_interval_days > 0 && $currentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s')) table-danger @elseif(FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->charge_interval_days > 0 && $currentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s', strtotime("+$nextXDays days")))
 					table-warning
 					@endif">
 					<td class="fit-content border-right">
@@ -149,8 +147,7 @@
 							,
 							$currentBatteryEntry->battery_id)->charge_interval_days > 0 && $currentBatteryEntry->next_estimated_charge_time < date('Y-m-d
 								H:i:s',
-								strtotime("+$nextXDays
-								days")))
+								strtotime("+$nextXDays days")))
 								duesoon
 								@endif
 								</td>
diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php
index 7ebf2a0c..7063499d 100644
--- a/views/choresoverview.blade.php
+++ b/views/choresoverview.blade.php
@@ -110,9 +110,7 @@
 			<tbody class="d-none">
 				@foreach($currentChores as $curentChoreEntry)
 				<tr id="chore-{{ $curentChoreEntry->chore_id }}-row"
-					class="@if(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d H:i:s')) table-danger @elseif(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d H:i:s', strtotime("
-					+$nextXDays
-					days")))
+					class="@if(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d H:i:s')) table-danger @elseif(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d H:i:s', strtotime("+$nextXDays days")))
 					table-warning
 					@endif">
 					<td class="fit-content border-right">
@@ -191,8 +189,7 @@
 							,
 							$curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d
 								H:i:s',
-								strtotime("+$nextXDays
-								days")))
+								strtotime("+$nextXDays days")))
 								duesoon
 								@endif
 								</td>
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 97b475ee..d7e0bf32 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -54,9 +54,7 @@
 			<tbody class="d-none">
 				@foreach($stockEntries as $stockEntry)
 				<tr id="stock-{{ $stockEntry->id }}-row"
-					class="@if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $stockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime('-1 days')) && $stockEntry->amount > 0) table-danger @elseif(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $stockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime("
-					+$nextXDays
-					days"))
+					class="@if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $stockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime('-1 days')) && $stockEntry->amount > 0) table-danger @elseif(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $stockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime("+$nextXDays days"))
 					&&
 					$stockEntry->amount > 0) table-warning @endif">
 					<td class="fit-content border-right">
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index 7aa251d1..78c579a4 100644
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -142,9 +142,7 @@
 			<tbody class="d-none">
 				@foreach($currentStock as $currentStockEntry)
 				<tr id="product-{{ $currentStockEntry->product_id }}-row"
-					class="@if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime('-1 days')) && $currentStockEntry->amount > 0) table-danger @elseif(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime("
-					+$nextXDays
-					days"))
+					class="@if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime('-1 days')) && $currentStockEntry->amount > 0) table-danger @elseif(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime("+$nextXDays days"))
 					&&
 					$currentStockEntry->amount > 0) table-warning @elseif ($currentStockEntry->product_missing) table-info @endif">
 					<td class="fit-content border-right">
@@ -324,8 +322,7 @@
 							&&
 							$currentStockEntry->amount > 0) expired @elseif($currentStockEntry->best_before_date < date('Y-m-d
 								23:59:59',
-								strtotime("+$nextXDays
-								days"))
+								strtotime("+$nextXDays days"))
 								&&
 								$currentStockEntry->amount > 0) expiring @endif @if($currentStockEntry->product_missing) belowminstockamount @endif
 					</td>
diff --git a/views/tasks.blade.php b/views/tasks.blade.php
index 89ebb583..fc079c66 100644
--- a/views/tasks.blade.php
+++ b/views/tasks.blade.php
@@ -156,8 +156,7 @@
 						@if($task->done == 1) text-muted @endif @if(!empty($task->due_date) && $task->due_date < date('Y-m-d'))
 							overdue
 							@elseif(!empty($task->due_date) && $task->due_date < date('Y-m-d',
-								strtotime("+$nextXDays
-								days")))
+								strtotime("+$nextXDays days")))
 								duesoon
 								@endif
 								</td>