Quellcode durchsuchen

Added shortcut buttons and filter by test result.

Alan Lam vor 8 Jahren
Ursprung
Commit
6ecd4747d2
2 geänderte Dateien mit 68 neuen und 23 gelöschten Zeilen
  1. 3 1
      controllers/tests.php
  2. 65 22
      views/test_list.php

+ 3 - 1
controllers/tests.php

@@ -22,6 +22,7 @@ if($user->level >= User::LEVEL_ADMIN) {
 	$location_id = http::value("location_id", "int");
 	$test_id = http::value("test_id", "int");
 	$location_internal_id = http::value("location_internal_id", "int");
+	$pass = http::value("pass", "int");
 
 	$nvp = [];
 	if($status) $nvp["status"] = $status;
@@ -34,6 +35,7 @@ if($user->level >= User::LEVEL_ADMIN) {
 		}
 	}
 	if($test_id) $nvp["id"] = $test_id;
+	if(strlen($pass) > 0) $nvp["pass"] = $pass;
 
 	$filter_count = count($nvp);
 	if(!$filter_count) $filter_count = "";
@@ -84,7 +86,7 @@ if($user->level >= User::LEVEL_ADMIN) {
 	];
 
 	View::includeOnce("header", compact("page_title"));
-	View::include("test_list", compact("tests", "test_count", "sort", "sorts", "pagination_string", "projects", "project_id", "location_id", "location_internal_id", "test_id", "filter_count", "status"));
+	View::include("test_list", compact("tests", "test_count", "sort", "sorts", "pagination_string", "projects", "project_id", "location_id", "location_internal_id", "pass", "test_id", "filter_count", "status"));
 }
 
 // HQ / Venue (view completed tests)

+ 65 - 22
views/test_list.php

@@ -5,41 +5,69 @@ unset($query["path"]);
 
 $query["sort"] = "SORT";
 
+$results = [
+	"" => "Any",
+	"1" => "Pass",
+	"0" => "Fail",
+];
+
 ?>
 <div class="container mt-3 py-4">
 
 	<div class="row">
-		<div class="col">
+		<div class="col-sm">
 			<h2>
 				Tests
 			</h2>
 		</div>
-		<div class="col-auto">
-			<a class="btn btn-outline-primary" href="#filters" data-toggle="collapse">
-				Toggle Filters <span class="badge badge-pill badge-danger"><?=$filter_count?></span>
-			</a>
-		</div>
-		<div class="col-auto pl-0">
-			<div class="input-group">
-				<div class="input-group-prepend">
-					<span class="input-group-text">
-						Sort
-					</span>
+		<div class="col-sm-auto">
+			<div class="row">
+				<div class="col-auto">
+					<a class="btn btn-outline-primary" href="#filters" data-toggle="collapse">
+						Toggle Filters <span class="badge badge-pill badge-danger"><?=$filter_count?></span>
+					</a>
+				</div>
+				<div class="col">
+					<div class="input-group">
+						<div class="input-group-prepend">
+							<span class="input-group-text">
+								Sort
+							</span>
+						</div>
+						<select class="form-control" id="sort-dropdown" data-url-template="/account/tests?<?=htmlspecialchars(http_build_query($query))?>">
+						<?php
+						foreach($sorts as $value => $display) {
+							$selected = ($value == $sort) ? "selected" : "";
+							?>
+							<option value="<?=$value?>" <?=$selected?>><?=$display?></option>
+							<?php
+						}
+						?>
+						</select>
+					</div>
 				</div>
-				<select class="form-control" id="sort-dropdown" data-url-template="/account/tests?<?=htmlspecialchars(http_build_query($query))?>">
-				<?php
-				foreach($sorts as $value => $display) {
-					$selected = ($value == $sort) ? "selected" : "";
-					?>
-					<option value="<?=$value?>" <?=$selected?>><?=$display?></option>
-					<?php
-				}
-				?>
-				</select>
 			</div>
 		</div>
 	</div>
 
+	<div class="row my-3">
+		<div class="col mb-1">
+			<a class="btn btn-block btn-primary" href="/account/tests">Show All</a>
+		</div>
+		<div class="col mb-1">
+			<a class="btn btn-block btn-secondary" href="/account/tests?status=<?=Test::STATUS_UNASSIGNED?>">Unassigned</a>
+		</div>
+		<div class="col mb-1">
+			<a class="btn btn-block btn-warning" href="/account/tests?status=<?=Test::STATUS_CONFIRMED?>">Confirmed</a>
+		</div>
+		<div class="col mb-1">
+			<a class="btn btn-block btn-success" href="/account/tests?status=<?=Test::STATUS_PENDING_VERIFICATION?>">Pending Verification</a>
+		</div>
+		<div class="col mb-1">
+			<a class="btn btn-block btn-danger" href="/account/tests?pass=0">Fails</a>
+		</div>
+	</div>
+
 	<div class="<?=$filters_collapse?>" id="filters">
 		<form method="get">
 			<div class="card mb-3">
@@ -100,6 +128,21 @@ $query["sort"] = "SORT";
 									<input class="form-control" type="text" name="test_id" id="test-id" placeholder="Enter test ID" value="<?=$test_id?>" />
 								</div>
 							</div>
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label" for="pass">Result</label>
+								<div class="col-sm">
+									<select class="form-control" name="pass" id="pass">
+										<?php
+										foreach($results as $value => $display) {
+											$selected = (strval($value) === strval($pass)) ? "selected" : "";
+											?>
+											<option value="<?=$value?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
+											<?php
+										}
+										?>
+									</select>
+								</div>
+							</div>
 							<br />
 							<button class="btn btn-primary" type="submit">Filter</button>
 							<a class="btn btn-secondary" href="/account/tests">Clear Filters</a>