Просмотр исходного кода

Add support for toggling unverified testers on project page

Alan Lam 8 лет назад
Родитель
Сommit
f53383852e
3 измененных файлов с 17 добавлено и 7 удалено
  1. 3 2
      controllers/project_ajax.php
  2. 5 2
      public/js/app-project.js
  3. 9 3
      views/project.php

+ 3 - 2
controllers/project_ajax.php

@@ -90,11 +90,11 @@ if($submit) {
 				break;
 			}
 
-
 			// Gets testers near a project
 			case "get-testers": {
 
 				$location_id = http::value("location_id", "int");
+				$include_unverified = http::value("include_unverified", "int");
 				$location = Location::get($location_id);
 				if(!$location) throw new Exception("Location not found.");
 
@@ -157,9 +157,10 @@ if($submit) {
 					$is_current_tester = $user->id == $test->tester_id;
 					$is_deactivated = $user->level == User::LEVEL_DEACTIVATED;
 					$is_registered = $user->level == User::LEVEL_REGISTERED;
-					$is_unverified = $user->level == User::LEVEL_UNVERIFIED;
+					$is_unverified = $user->level <= User::LEVEL_UNVERIFIED;
 
 					if($is_deactivated) continue;
+					if(!$include_unverified && $is_unverified) continue;
 
 					$distance_miles = Geolocation::getDistance($location->getGeolocation(), $address->getGeolocation());
 					$distance_kilometers = $distance_miles * Geolocation::KMS_IN_MILE;

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

@@ -56,7 +56,7 @@ $(function() {
 
 		return true;
 	});
-	$("#testers-max-distance").change(function() {
+	$("#testers-max-distance, #testers-include-unverified").change(function() {
 		if(selectedLocation) {
 			clearTesters();
 			initialiseTesters();
@@ -283,9 +283,12 @@ function initialiseTesters() {
 
 	$("#tester-list-loading-container").text("Loading available testers...");
 
+	let includeUnverified = $("#testers-include-unverified").val();
+
 	$.post("/account/projects/" + projectID + "/get-testers", {
 		submit: $("#submit").val(),
-		location_id: selectedLocation.id
+		location_id: selectedLocation.id,
+		include_unverified: includeUnverified
 	}, function(response) {
 		if(!response.success) return;
 		if(!response.testers || response.testers.length == 0) {

+ 9 - 3
views/project.php

@@ -155,17 +155,23 @@ var projectID = <?=$project->id?>;
 					<div class="input-group mb-3">
 						<div class="input-group-prepend">
 							<span class="input-group-text">
-								Filter
+								<i class="fal fa-filter"></i>
 							</span>
 						</div>
-						<input class="form-control" type="text" placeholder="Enter name or ID" data-filter-target="#testers-tbody" />
+						<input class="form-control" type="text" placeholder="Name / ID" data-filter-target="#testers-tbody" />
 					</div>
 				</div>
+				<div class="col-md">
+					<select class="form-control mb-3" id="testers-include-unverified">
+						<option value="0">Exc. Unverified</option>
+						<option value="1">Inc. Unverified</option>
+					</select>
+				</div>
 				<div class="col-md">
 					<div class="input-group mb-3">
 						<div class="input-group-prepend">
 							<span class="input-group-text">
-								Up to
+								<i class="fal fa-car"></i>
 							</span>
 						</div>
 						<select class="form-control" id="testers-max-distance">