From edd372f8c491a235a74bf74c6c9e863c32c92def Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Fri, 27 Aug 2021 20:54:27 +0200
Subject: [PATCH] Optimized chore/battery tracking input focus handling

---
 public/viewjs/batterytracking.js | 14 ++++++++++++--
 public/viewjs/choretracking.js   | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/public/viewjs/batterytracking.js b/public/viewjs/batterytracking.js
index e96fbb48..ce7a220c 100644
--- a/public/viewjs/batterytracking.js
+++ b/public/viewjs/batterytracking.js
@@ -53,7 +53,12 @@ $('#battery_id').on('change', function(e)
 	if (batteryId)
 	{
 		Grocy.Components.BatteryCard.Refresh(batteryId);
-		$('#tracked_time').find('input').focus();
+
+		setTimeout(function()
+		{
+			$('#tracked_time').find('input').focus();
+		}, 200);
+
 		Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
 	}
 });
@@ -117,7 +122,7 @@ $(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
 		$("#battery_id_text_input").focusout();
 		$("#battery_id_text_input").focus();
 		$("#battery_id_text_input").blur();
-		Grocy.Components.DateTimePicker.GetInputElement().focus();
+		$('#tracked_time').find('input').focus();
 	}, 200);
 });
 
@@ -170,3 +175,8 @@ $('#battery_id_text_input').on('blur', function(e)
 		}
 	}
 });
+
+$("#tracked_time").find("input").on("focus", function(e)
+{
+	$(this).select();
+});
diff --git a/public/viewjs/choretracking.js b/public/viewjs/choretracking.js
index e155be1c..5fd3bb71 100644
--- a/public/viewjs/choretracking.js
+++ b/public/viewjs/choretracking.js
@@ -76,7 +76,12 @@ $('#chore_id').on('change', function(e)
 		);
 
 		Grocy.Components.ChoreCard.Refresh(choreId);
-		Grocy.Components.DateTimePicker.GetInputElement().focus();
+
+		setTimeout(function()
+		{
+			Grocy.Components.DateTimePicker.GetInputElement().focus();
+		}, 200);
+
 		Grocy.FrontendHelpers.ValidateForm('choretracking-form');
 	}
 });
@@ -133,7 +138,7 @@ $(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
 		$("#chore_id_text_input").focusout();
 		$("#chore_id_text_input").focus();
 		$("#chore_id_text_input").blur();
-		Grocy.Components.DateTimePicker.GetInputElement().focus();
+		$('#tracked_time').find('input').focus();
 	}, 200);
 });
 
@@ -190,3 +195,8 @@ $('#chore_id_text_input').on('blur', function(e)
 		}
 	}
 });
+
+$("#tracked_time").find("input").on("focus", function(e)
+{
+	$(this).select();
+});