Преглед изворни кода

Adds sorting support to tests list for admins.

Alan Lam пре 8 година
родитељ
комит
36a6053194
3 измењених фајлова са 56 додато и 5 уклоњено
  1. 22 2
      controllers/tests.php
  2. 7 0
      public/js/app.js
  3. 27 3
      views/test_list.php

+ 22 - 2
controllers/tests.php

@@ -31,7 +31,21 @@ if($user->level >= User::LEVEL_ADMIN) {
 	$filter_count = count($nvp);
 	if(!$filter_count) $filter_count = "";
 
-	$tests = Test::query($nvp, ["sort" => "status"]);
+	$sort = http::value("sort");
+	switch($sort) {
+		case "updated":
+			$query_options = ["sort" => "dts_updated", "order" => "desc"];
+			break;
+		case "due":
+			$query_options = ["sort" => "dts_due", "order" => "desc"];
+			break;
+		default:
+			$sort = "status";
+			$query_options = ["sort" => "status", "order" => "asc"];
+			break;
+	}
+
+	$tests = Test::query($nvp, $query_options);
 	$test_count = count($tests);
 
 	$page_count = ceil($test_count / $page_size);
@@ -56,8 +70,14 @@ if($user->level >= User::LEVEL_ADMIN) {
 
 	$pagination_string = "Showing $item_number_first-$item_number_last of $test_count tests";
 
+	$sorts = [
+		"status" => "Status",
+		"updated" => "Update",
+		"due" => "Due",
+	];
+
 	View::includeOnce("header", compact("page_title"));
-	View::include("test_list", compact("tests", "test_count", "pagination_string", "projects", "project_id", "location_id", "test_id", "filter_count", "status"));
+	View::include("test_list", compact("tests", "test_count", "sort", "sorts", "pagination_string", "projects", "project_id", "location_id", "test_id", "filter_count", "status"));
 }
 
 // HQ / Venue (view completed tests)

+ 7 - 0
public/js/app.js

@@ -8,6 +8,13 @@ $(function() {
 		window.location = url;
 	});
 
+	$("#sort-dropdown").change(function(event) {
+		let urlTemplate = $(this).data("url-template");
+		let sort = $(this).val();
+		let url = urlTemplate.replace("SORT", sort);
+		window.location = url;
+	});
+
 });
 
 var maps = [];

+ 27 - 3
views/test_list.php

@@ -1,7 +1,11 @@
 <?php
 $filters_collapse = $filter_count ? "collapse show" : "collapse";
-?>
+$query = $_GET;
+unset($query["path"]);
+
+$query["sort"] = "SORT";
 
+?>
 <div class="container mt-3 py-4">
 
 	<div class="row">
@@ -15,6 +19,25 @@ $filters_collapse = $filter_count ? "collapse show" : "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>
+				<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="<?=$filters_collapse?>" id="filters">
@@ -74,6 +97,7 @@ $filters_collapse = $filter_count ? "collapse show" : "collapse";
 					<a class="btn btn-secondary" href="/account/tests">Clear Filters</a>
 				</div>
 			</div>
+			<input type="hidden" name="sort" value="<?=$sort?>" />
 		</form>
 	</div>
 
@@ -105,7 +129,7 @@ $filters_collapse = $filter_count ? "collapse show" : "collapse";
 
 			<table class="table table-sm table-hover" style="min-width: 1024px;">
 				<thead>
-					<th>ID</th>
+					<th class="pr-3">ID</th>
 					<th>Location</th>
 					<th>Project</th>
 					<th>Tester</th>
@@ -128,7 +152,7 @@ $filters_collapse = $filter_count ? "collapse show" : "collapse";
 					?>
 
 					<tr>
-						<td class="text-right">
+						<td class="text-right pr-3">
 							<?=$test->id?>
 						</td>
 						<td class="align-middle">