Explorar el Código

Adds distance filter for testers.

Alan Lam hace 8 años
padre
commit
78132d91a6
Se han modificado 2 ficheros con 47 adiciones y 9 borrados
  1. 15 2
      public/js/app-project.js
  2. 32 7
      views/project.php

+ 15 - 2
public/js/app-project.js

@@ -1,7 +1,7 @@
 var locationMarkers = [];
 var assignMarkers = [];
 
-var selectedLocation;
+var selectedLocation = false;
 var selectedTester;
 
 var locationLatLngBounds;
@@ -56,6 +56,11 @@ $(function() {
 
 		return true;
 	});
+	$("#testers-max-distance").change(function() {
+		if(selectedLocation) {
+			initialiseTesters();
+		}
+	});
 });
 
 function initialiseLocations() {
@@ -291,9 +296,14 @@ function initialiseTesters() {
 
 		$("#tester-list-loading-container").text(response.testers.length + " tester addresses found in the vicinity.");
 
+		let tbody = $("#testers-tbody").detach();
+		let maxDistance = $("#testers-max-distance").val();
+
 		for(let i in response.testers) {
 			let tester = response.testers[i];
 
+			if(tester.distanceMiles > maxDistance) continue;
+
 			let position = {
 				lat: tester.latitude,
 				lng: tester.longitude
@@ -360,8 +370,11 @@ function initialiseTesters() {
 			}
 			tr.append(td);
 
-			$("#testers-tbody").append(tr);
+			$(tbody).append(tr);
 		}
+
+		$("#testers-table").append(tbody);
+
 	});
 }
 

+ 32 - 7
views/project.php

@@ -150,17 +150,42 @@ var projectID = <?=$project->id?>;
 
 			<h3>Testers</h3>
 
-			<div class="input-group mb-3">
-				<div class="input-group-prepend">
-					<span class="input-group-text">
-						Filter
-					</span>
+			<div class="row">
+				<div class="col-md">
+					<div class="input-group mb-3">
+						<div class="input-group-prepend">
+							<span class="input-group-text">
+								Filter
+							</span>
+						</div>
+						<input class="form-control" type="text" placeholder="Enter name or ID" data-filter-target="#testers-tbody" />
+					</div>
+				</div>
+				<div class="col-md">
+					<div class="input-group mb-3">
+						<div class="input-group-prepend">
+							<span class="input-group-text">
+								Up to
+							</span>
+						</div>
+						<select class="form-control" id="testers-max-distance">
+							<option value="5">5 miles</option>
+							<option value="10">10 miles</option>
+							<option value="15">15 miles</option>
+							<option value="20">20 miles</option>
+							<option value="25" selected>25 miles</option>
+							<option value="50">50 miles</option>
+							<option value="100">100 miles</option>
+							<option value="200">200 miles</option>
+							<option value="25000">Unlimited</option>
+						</select>
+					</div>
 				</div>
-				<input class="form-control" type="text" placeholder="Enter name or ID" data-filter-target="#testers-tbody" />
 			</div>
 
+
 			<div class="limit-height-2">
-				<table class="table table-hover table-sm">
+				<table id="testers-table" class="table table-hover table-sm">
 					<thead>
 						<tr>
 							<th class="text-right">ID</th>