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

+ 2 - 0
controllers/project_ajax.php

@@ -99,6 +99,7 @@ if($submit) {
 
 				$location_id = http::value("location_id", "int");
 				$include_unverified = http::value("include_unverified", "int");
+				$minimum_score = http::value("minimum_score", "int");
 				$location = Location::get($location_id);
 				if(!$location) throw new Exception("Location not found.");
 
@@ -178,6 +179,7 @@ if($submit) {
 					if($is_deactivated) continue;
 					if(!$include_unverified && $is_unverified) continue;
 					if(!$is_tester) continue;
+					if($user->score < $minimum_score) continue;
 
 					$distance_miles = Geolocation::getDistance($location->getGeolocation(), $address->getGeolocation());
 					$distance_kilometers = $distance_miles * Geolocation::KMS_IN_MILE;

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

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

+ 17 - 4
views/project.php

@@ -185,7 +185,17 @@ var projectID = <?=$project->id?>;
 		</div>
 		<div class="col-lg-6 mb-3">
 
-			<h3>Testers</h3>
+			<div class="row">
+				<div class="col">
+					<h3>Testers</h3>
+				</div>
+				<div class="col-auto">
+					<div class="custom-control custom-switch">
+						<input id="testers-include-unverified" type="checkbox" class="custom-control-input" value="1" />
+						<label for="testers-include-unverified" class="custom-control-label"><?=htmlspecialchars(__("Verified Only"))?></label>
+					</div>
+				</div>
+			</div>
 
 			<div class="row">
 				<div class="col-md">
@@ -199,9 +209,12 @@ var projectID = <?=$project->id?>;
 					</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 class="form-control mb-3" id="testers-minimum-score">
+						<option value="-999">Any score</option>
+						<option value="0">0+ score</option>
+						<option value="5">5+ score</option>
+						<option value="10">10+ score</option>
+						<option value="20">20+ score</option>
 					</select>
 				</div>
 				<div class="col-md">