From 9cac3b231181b44f55ae6493e797956339ae8e5c Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Tue, 14 Jan 2025 19:43:12 +0100
Subject: [PATCH] Make track now / next schedule buttons on /choresoverview
 swappable (closes #2424)

---
 changelog/77_UNRELEASED_xxxx-xx-xx.md |  2 +-
 config-dist.php                       |  1 +
 localization/strings.pot              |  3 +++
 public/viewjs/choressettings.js       |  5 +++++
 views/choresoverview.blade.php        | 12 +++++++++--
 views/choressettings.blade.php        | 30 ++++++++++++++++++++-------
 6 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/changelog/77_UNRELEASED_xxxx-xx-xx.md b/changelog/77_UNRELEASED_xxxx-xx-xx.md
index 1b0d7ae2..c1404296 100644
--- a/changelog/77_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/77_UNRELEASED_xxxx-xx-xx.md
@@ -42,7 +42,7 @@
 
 ### Chores
 
-- xxx
+- Added a new option "Swap track next schedule / track now buttons" (stock settings / top right corner settings menu) to swap the "Track next chore schedule" and "Track chore execution now" buttons/menu items on the chores overview page (defaults to disabled, so no changed behavior when not configured)
 
 ### Calendar
 
diff --git a/config-dist.php b/config-dist.php
index 2fc115bf..c8818a18 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -207,6 +207,7 @@ DefaultUserSetting('recipes_show_ingredient_checkbox', false); // When enabled,
 
 // Chores settings
 DefaultUserSetting('chores_due_soon_days', 5); // The "due soon" days
+DefaultUserSetting('chores_overview_swap_tracking_buttons', false); // When enabled, the "Track next chore schedule" and "Track chore execution now" buttons/menu items are swapped
 
 // Batteries settings
 DefaultUserSetting('batteries_due_soon_days', 5); // The "due soon" days
diff --git a/localization/strings.pot b/localization/strings.pot
index 6b15a4fa..798f8fd0 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -2437,3 +2437,6 @@ msgstr ""
 
 msgid "Configure colors"
 msgstr ""
+
+msgid "Swap track next schedule / track now buttons"
+msgstr ""
diff --git a/public/viewjs/choressettings.js b/public/viewjs/choressettings.js
index 52967a6a..14bbdf88 100644
--- a/public/viewjs/choressettings.js
+++ b/public/viewjs/choressettings.js
@@ -1,3 +1,8 @@
 $("#chores_due_soon_days").val(Grocy.UserSettings.chores_due_soon_days);
 
+if (BoolVal(Grocy.UserSettings.chores_overview_swap_tracking_buttons))
+{
+	$("#chores_overview_swap_tracking_buttons").prop("checked", true);
+}
+
 RefreshLocaleNumberInput();
diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php
index e129e12e..75ace6f2 100644
--- a/views/choresoverview.blade.php
+++ b/views/choresoverview.blade.php
@@ -136,11 +136,15 @@
 				<tr id="chore-{{ $curentChoreEntry->chore_id }}-row"
 					class="@if($curentChoreEntry->due_type == 'overdue') table-danger @elseif($curentChoreEntry->due_type == 'duetoday') table-info @elseif($curentChoreEntry->due_type == 'duesoon') table-warning @endif">
 					<td class="fit-content border-right">
-						<a class="btn btn-success btn-sm track-chore-button permission-CHORE_TRACK_EXECUTION"
+						<a class="btn btn-success btn-sm track-chore-button permission-CHORE_TRACK_EXECUTION @if(boolval($userSettings['chores_overview_swap_tracking_buttons'])) now @endif"
 							href="#"
 							data-toggle="tooltip"
 							data-placement="left"
+							@if(boolval($userSettings['chores_overview_swap_tracking_buttons']))
+							title="{{ $__t('Track chore execution now') }}"
+							@else
 							title="{{ $__t('Track next chore schedule') }}"
+							@endif
 							data-chore-id="{{ $curentChoreEntry->chore_id }}"
 							data-chore-name="{{ FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->name }}">
 							<i class="fa-solid fa-play"></i>
@@ -161,11 +165,15 @@
 								<i class="fa-solid fa-ellipsis-v"></i>
 							</button>
 							<div class="table-inline-menu dropdown-menu dropdown-menu-right">
-								<a class="dropdown-item track-chore-button now permission-CHORE_TRACK_EXECUTION"
+								<a class="dropdown-item track-chore-button permission-CHORE_TRACK_EXECUTION @if(!boolval($userSettings['chores_overview_swap_tracking_buttons'])) now @endif"
 									data-chore-id="{{ $curentChoreEntry->chore_id }}"
 									type="button"
 									href="#">
+									@if(boolval($userSettings['chores_overview_swap_tracking_buttons']))
+									<span>{{ $__t('Track next chore schedule') }}</span>
+									@else
 									<span>{{ $__t('Track chore execution now') }}</span>
+									@endif
 								</a>
 								<a class="dropdown-item reschedule-chore-button permission-CHORE_TRACK_EXECUTION"
 									data-chore-id="{{ $curentChoreEntry->chore_id }}"
diff --git a/views/choressettings.blade.php b/views/choressettings.blade.php
index 3b247f07..a57edc5e 100644
--- a/views/choressettings.blade.php
+++ b/views/choressettings.blade.php
@@ -13,17 +13,31 @@
 
 <div class="row">
 	<div class="col-lg-6 col-12">
+		<h4 ">{{ $__t('Chores overview') }}</h4>
+
 		@include('components.numberpicker', array(
 		'id' => 'chores_due_soon_days',
-		'additionalAttributes' => 'data-setting-key="chores_due_soon_days"',
-		'label' => 'Due soon days',
-		'min' => 0,
-		'additionalCssClasses' => 'user-setting-control',
-		'hint' => $__t('Set to 0 to hide due soon filters/highlighting')
-		))
+		'additionalAttributes' => 'data-setting-key=" chores_due_soon_days"', 'label'=> 'Due soon days',
+			'min' => 0,
+			'additionalCssClasses' => 'user-setting-control',
+			'hint' => $__t('Set to 0 to hide due soon filters/highlighting')
+			))
 
-		<a href="{{ $U('/choresoverview') }}"
-			class="btn btn-success">{{ $__t('OK') }}</a>
+			<div class="form-group">
+				<div class="custom-control custom-checkbox">
+					<input type="checkbox"
+						class="form-check-input custom-control-input user-setting-control"
+						id="chores_overview_swap_tracking_buttons"
+						data-setting-key="chores_overview_swap_tracking_buttons">
+					<label class="form-check-label custom-control-label"
+						for="chores_overview_swap_tracking_buttons">
+						{{ $__t('Swap track next schedule / track now buttons') }}
+					</label>
+				</div>
+			</div>
+
+			<a href="{{ $U('/choresoverview') }}"
+				class="btn btn-success">{{ $__t('OK') }}</a>
 	</div>
 </div>
 @stop