From 6b69487bc5f918b4f3cd0bdc039f12d5788be797 Mon Sep 17 00:00:00 2001
From: geoffwright240 <geoff@wrightville.org>
Date: Mon, 25 Dec 2023 02:47:21 -0500
Subject: [PATCH] Added 'category' filter to tasks view. (#2412)

* Added 'category' filter to tasks view.

* Remove extraneous css attributes.

* Applied code style rules

* Use correct column

* Task categories are not something that is translated...

* Added "Uncategorized" as additional filter option

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
---
 public/viewjs/tasks.js | 13 +++++++++++++
 views/tasks.blade.php  | 16 ++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js
index 7ad30df2..07b75335 100644
--- a/public/viewjs/tasks.js
+++ b/public/viewjs/tasks.js
@@ -34,12 +34,25 @@ $("#status-filter").on("change", function()
 	tasksTable.column(tasksTable.colReorder.transpose(5)).search(value).draw();
 });
 
+$("#category-filter").on("change", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+
+	tasksTable.column(tasksTable.colReorder.transpose(3)).search(value).draw();
+});
+
 $("#clear-filter-button").on("click", function()
 {
 	$("#search").val("");
 	$("#status-filter").val("all");
+	$("#category-filter").val("all");
 	$("#search").trigger("keyup");
 	$("#status-filter").trigger("change");
+	$("#category-filter").trigger("change");
 	$("#show-done-tasks").trigger('checked', false);
 });
 
diff --git a/views/tasks.blade.php b/views/tasks.blade.php
index 92385f8b..fe952116 100644
--- a/views/tasks.blade.php
+++ b/views/tasks.blade.php
@@ -81,6 +81,22 @@
 			</select>
 		</div>
 	</div>
+	<div class="col-12 col-md-6 col-xl-3">
+		<div class="input-group">
+			<div class="input-group-prepend">
+				<span class="input-group-text"><i class="fa-solid fa-filter"></i>&nbsp;{{ $__t('Category') }}</span>
+			</div>
+			<select class="custom-control custom-select"
+				id="category-filter">
+				<option value="all">{{ $__t('All') }}</option>
+				@foreach($taskCategories as $taskCategory)
+				<option value="{{ $taskCategory->name }}">{{ $taskCategory->name }}</option>
+				@endforeach
+				<option class="font-italic font-weight-light"
+					value="{{ $__t('Uncategorized') }}">{{ $__t('Uncategorized') }}</option>
+			</select>
+		</div>
+	</div>
 	<div class="col-12 col-md-6 col-xl-3">
 		<div class="form-check custom-control custom-checkbox">
 			<input class="form-check-input custom-control-input"