Explorar o código

Add support to sort users/testers

Alan Lam %!s(int64=8) %!d(string=hai) anos
pai
achega
9dd3f511c4
Modificáronse 2 ficheiros con 53 adicións e 6 borrados
  1. 19 3
      controllers/users.php
  2. 34 3
      views/users.php

+ 19 - 3
controllers/users.php

@@ -7,10 +7,14 @@ else {
 	$page_title = "Testers";
 }
 
-
 Core::addBreadcrumb("/account", "Account");
 Core::addBreadcrumb("/account/users", $page_title);
 
+$sorts = [
+	"newest" => "Newest",
+	"score" => "Score",
+];
+
 $id = http::value("id", "int");
 $first_name = http::value("first_name", "trim");
 $last_name = http::value("last_name", "trim");
@@ -34,7 +38,19 @@ if(empty($nvp)) {
 	$nvp["level"] = (new Constraint("NOT_EQUALS"))->setValues(User::LEVEL_REGISTERED);
 }
 
-$users = User::query($nvp);
+$sort = http::value("sort");
+switch($sort) {
+	case "score":
+		$query_options = ["sort" => "score", "order" => "desc"];
+		break;
+	default:
+		$sort = "newest";
+		$query_options = ["sort" => "id", "order" => "desc"];
+		break;
+}
+
+
+$users = User::query($nvp, $query_options);
 
 $pagination_object = Util::getPaginationObject($users);
 
@@ -45,7 +61,7 @@ $users = array_slice($users, $pagination_object->offset, $pagination_object->pag
 
 
 View::includeOnce("header", compact("page_title"));
-View::include("users", compact("users", "pagination_object", "filter_count", "id", "first_name", "last_name", "email", "level", "customer_id", "location_id"));
+View::include("users", compact("users", "pagination_object", "filter_count", "id", "first_name", "last_name", "email", "level", "customer_id", "location_id", "sort", "sorts"));
 View::includeOnce("modal_page_jump");
 View::includeOnce("footer");
 

+ 34 - 3
views/users.php

@@ -1,12 +1,43 @@
+<?php
+
+$query = $_GET;
+unset($query["path"]);
+$query["sort"] = "SORT";
+
+?>
 <div class="container mt-3 py-4">
 	<div class="row">
 		<div class="col">
 			<h2>Users</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 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/users?<?=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>
 	</div>