Admin device search now indexes serial number

arc12012 · Apr 6, 2017 · a3dbda4 · a3dbda4
1 parent 523a88e
commit a3dbda4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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,