Parcourir la source

Add toggle to include/exclude testers in "Map Overview" page

Alan Lam il y a 2 ans
Parent
commit
15aa312793
3 fichiers modifiés avec 18 ajouts et 5 suppressions
  1. 10 1
      controllers/addresses_ajax.php
  2. 4 4
      public/js/app-map-overview.js
  3. 4 0
      views/map_overview.php

+ 10 - 1
controllers/addresses_ajax.php

@@ -13,8 +13,17 @@ JSON::header();
 
 switch($action) {
 	case "get-all":
+		$include_archived = HTTP::value("include_archived");
 
-		$users = User::query(["level" => User::LEVEL_TESTER]);
+		$nvp = [
+			"level" => User::LEVEL_TESTER,
+		];
+
+		if(!$include_archived) {
+			$nvp["archived"] = 0;
+		}
+
+		$users = User::query($nvp);
 		$user_ids = array_column($users, "id");
 		$users = array_combine($user_ids, $users);
 

+ 4 - 4
public/js/app-map-overview.js

@@ -14,9 +14,7 @@ const clearMarkers = key => {
 };
 
 $(function() {
-
-	const $hideInactiveTestersSwitch = $("#hide-inactive-testers");
-	$hideInactiveTestersSwitch.on("change", () => loadAllAddresses());
+	$("#hide-inactive-testers, #include-archived").on("change", () => loadAllAddresses());
 
 	const $customerRows = $("a[data-customer-id]");
 
@@ -270,9 +268,11 @@ function loadAllAddresses() {
 
 	const $allAddresses = $("a[data-all-addresses]");
 	const hideInactive = $("#hide-inactive-testers").prop("checked");
+	const includeArchived = $("#include-archived").prop("checked") ? 1 : 0;
 
 	$.get("/api/addresses/get-all", {
-		submit: $("#submit").val()
+		submit: $("#submit").val(),
+		include_archived: includeArchived
 	}, function(response) {
 		if(!response.success) return false;
 

+ 4 - 0
views/map_overview.php

@@ -93,6 +93,10 @@
 					<input class="custom-control-input" id="hide-inactive-testers" type="checkbox" value="1" />
 					<label class="custom-control-label" for="hide-inactive-testers"><?=htmlspecialchars(__("Hide red markers"))?></label>
 				</div>
+				<div class="custom-control custom-switch">
+					<input class="custom-control-input" id="include-archived" type="checkbox" value="1" />
+					<label class="custom-control-label" for="include-archived"><?=htmlspecialchars(__("Include archived"))?></label>
+				</div>
 			</section>
 
 			<div class="row align-items-center mb-3">