fixed a problem with other manufacturer in request, fixed listing popup

arc12012 · Apr 17, 2017 · 6cb7e19 · 6cb7e19
1 parent 467eeaf
commit 6cb7e19
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/WebContent/html/javascript/listing.jsp b/WebContent/html/javascript/listing.jsp
@@ -67,7 +67,7 @@ function show(deviceArray){
     var part2 = "');"
 	for (var i = 0; i < deviceArray.length; i++) 
 	{
-		html += '<div class = "deviceContainer"><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + devices[i].hardware + '<br><br>' + 'Manufacturer: ' + devices[i].manufacturer + part2 + '"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><div class = "availableAnchor" id = "' + (deviceArray[i].id) + '"></div></div></a></div><br><br>'
+		html += '<div class = "deviceContainer"><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + deviceArray[i].hardware + '<br><br>' + 'Manufacturer: ' + deviceArray[i].manufacturer + part2 + '"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><div class = "availableAnchor" id = "' + (deviceArray[i].id) + '"></div></div></a></div><br><br>'
 	}
 	document.getElementById('devContainer').innerHTML = html;
 	var anchors = document.getElementsByClassName('availableAnchor');

diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp
@@ -94,21 +94,21 @@ function filter(deviceArray) {
 		if (activeHOptions.length == 0) {
 			hardwareMatch = true;
 		}
+		for(var j = 0; j < activeSOptions.length; j++) {
+			if (activeSOptions[j] == devices[i].manufacturer){
+				softwareMatch = true;
+			}
 		// now we must handle the 'other' case
 		// there is no 'other' catagory, so if that is the option selected we must make sure
 		// that the device in question is not one of the categories we DO have options for
-		if(activeSOptions[j] === 'Other')
-		{
-			var othermatch = true;
-			for (var k = 0; k < softwareOptions.length; k++) {
-				if(devices[i].manufacturer == softwareOptions[k].getAttribute('data-type'))
-					othermatch = false;
-			}
-			if(othermatch) softwareMatch = true;
-		}
-		for(var j = 0; j < activeSOptions.length; j++) {
-			if (activeSOptions[j] == deviceArray[i].manufacturer){
-				softwareMatch = true;
+			if(activeSOptions[j] === 'Other')
+			{
+				var othermatch = true;
+				for (var k = 0; k < softwareOptions.length; k++) {
+					if(devices[i].manufacturer == softwareOptions[k].getAttribute('data-type'))
+						othermatch = false;
+				}
+				if(othermatch) softwareMatch = true;
 			}
 		}
 		if (activeSOptions.length == 0) {