From bc487b4867829277c5e18ad5faad6e136335f44a Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Tue, 17 Sep 2019 16:50:29 +0200
Subject: [PATCH] Make it possible to also filter by chore assignments on the
 chore overview page (references #253)

---
 localization/strings.pot        |  3 +++
 public/viewjs/choresoverview.js | 32 ++++++++++++++++++++++++++++++++
 views/choresoverview.blade.php  | 18 ++++++++++++++++--
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/localization/strings.pot b/localization/strings.pot
index c6fe570c..66dd6af1 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -1414,3 +1414,6 @@ msgstr ""
 
 msgid "assigned to %s"
 msgstr ""
+
+msgid "Filter by assignment"
+msgstr ""
diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js
index fc93ce6e..1c4f9cee 100644
--- a/public/viewjs/choresoverview.js
+++ b/public/viewjs/choresoverview.js
@@ -46,6 +46,25 @@ $("#status-filter").on("change", function()
 	choresOverviewTable.column(5).search(value).draw();
 });
 
+$("#user-filter").on("change", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+
+	// Transfer CSS classes of selected element to dropdown element (for background)
+	$(this).attr("class", $("#" + $(this).attr("id") + " option[value='" + value + "']").attr("class") + " form-control");
+
+	choresOverviewTable.column(6).search(value).draw();
+
+	if (!value.isEmpty())
+	{
+		UpdateUriParam("user", $("#user-filter option:selected").data("user-id"));
+	}
+});
+
 $(".status-filter-button").on("click", function()
 {
 	var value = $(this).data("status-filter");
@@ -53,6 +72,13 @@ $(".status-filter-button").on("click", function()
 	$("#status-filter").trigger("change");
 });
 
+$(".user-filter-button").on("click", function()
+{
+	var value = $(this).data("user-display-name-filter");
+	$("#user-filter").val(value);
+	$("#user-filter").trigger("change");
+});
+
 $(document).on('click', '.track-chore-button', function(e)
 {
 	e.preventDefault();
@@ -200,4 +226,10 @@ function RefreshStatistics()
 	);
 }
 
+if (GetUriParam("user") !== undefined)
+{
+	$("#user-filter").val("xx" + GetUriParam("user") + "xx");
+	$("#user-filter").trigger("change");
+}
+
 RefreshStatistics();
diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php
index 33febe05..d7f9d55e 100644
--- a/views/choresoverview.blade.php
+++ b/views/choresoverview.blade.php
@@ -18,7 +18,7 @@
 		</h1>
 		<p id="info-due-chores" data-status-filter="duesoon" data-next-x-days="{{ $nextXDays }}" class="btn btn-lg btn-warning status-filter-button responsive-button mr-2"></p>
 		<p id="info-overdue-chores" data-status-filter="overdue" class="btn btn-lg btn-danger status-filter-button responsive-button mr-2"></p>
-		<p id="info-assigned-to-me-chores" data-status-filter="assigned-to-me" class="btn btn-lg btn-secondary status-filter-button responsive-button"></p>
+		<p id="info-assigned-to-me-chores" data-user-display-name-filter="{{ GetUserDisplayName(FindObjectInArrayByPropertyValue($users, 'id', GROCY_USER_ID)) }}" class="btn btn-lg btn-secondary user-filter-button responsive-button"></p>
 	</div>
 </div>
 
@@ -33,7 +33,15 @@
 			<option class="bg-white" value="all">{{ $__t('All') }}</option>
 			<option class="bg-warning" value="duesoon">{{ $__t('Due soon') }}</option>
 			<option class="bg-danger" value="overdue">{{ $__t('Overdue') }}</option>
-			<option class="bg-secondary text-white" value="assigned-to-me">{{ $__t('Assigned to me') }}</option>
+		</select>
+	</div>
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="user-filter">{{ $__t('Filter by assignment') }}</label> <i class="fas fa-filter"></i>
+		<select class="form-control" id="user-filter">
+			<option></option>
+			@foreach($users as $user)
+		<option class="@if($user->id == GROCY_USER_ID) bg-secondary text-white @endif" data-user-id="{{ $user->id }}" value="xx{{ $user->id }}xx">{{ $user->display_name }}</option>
+			@endforeach
 		</select>
 	</div>
 </div>
@@ -49,6 +57,7 @@
 					<th>{{ $__t('Last tracked') }}</th>
 					<th>{{ $__t('Assigned to') }}</th>
 					<th class="d-none">Hidden status</th>
+					<th class="d-none">Hidden assigned to user id</th>
 
 					@include('components.userfields_thead', array(
 						'userfields' => $userfields
@@ -110,6 +119,11 @@
 						@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')) overdue @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"))) duesoon @endif
 						@if($curentChoreEntry->next_execution_assigned_to_user_id == GROCY_USER_ID) assigned-to-me @endif
 					</td>
+					<td class="d-none">
+						@if(!empty($curentChoreEntry->next_execution_assigned_to_user_id))
+							xx{{ $curentChoreEntry->next_execution_assigned_to_user_id }}xx
+						@endif
+					</td>
 
 					@include('components.userfields_tbody', array(
 						'userfields' => $userfields,