From a3dbda43509c2e889788b957e5f793bb4703b75a Mon Sep 17 00:00:00 2001 From: Adam R Claxton Date: Wed, 5 Apr 2017 23:16:19 -0400 Subject: [PATCH] Admin device search now indexes serial number --- WebContent/html/webpages/adminDeviceSettings.jsp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/WebContent/html/webpages/adminDeviceSettings.jsp b/WebContent/html/webpages/adminDeviceSettings.jsp index b90a45b..44d9c47 100644 --- a/WebContent/html/webpages/adminDeviceSettings.jsp +++ b/WebContent/html/webpages/adminDeviceSettings.jsp @@ -338,8 +338,15 @@ function fuzzyFilter(deviceArray) for (var i = modelFilterResults.length - 1; i >= 0; i--) { modelFilterResults[i].original.model=modelFilterResults[i].string; } + ////// Sixth pass: filter by Serial + options.extract = function(arg) {return arg.serial;}; + var serialFilterResults = fuzzy.filter(searchText, deviceArray, options); + // replace releveant field with bolded string + for (var i = serialFilterResults.length - 1; i >= 0; i--) { + serialFilterResults[i].original.serial=serialFilterResults[i].string; + } - var filteredResults = union([nameFilterResults,macFilterResults,manufacturerFilterResults,hardwareFilterResults,modelFilterResults]); + var filteredResults = union([nameFilterResults,macFilterResults,manufacturerFilterResults,hardwareFilterResults,modelFilterResults,serialFilterResults]); // this returns a filtered array of objects with attributes 'index', 'original', 'score', and 'string' // I am interested in the 'original' attribute, which is the relevant object exactly as it was submitted,