Răsfoiți Sursa

Add ability to hide red address markers in Map Overview

Alan Lam 3 ani în urmă
părinte
comite
9453823451
2 a modificat fișierele cu 41 adăugiri și 35 ștergeri
  1. 24 26
      public/js/app-map-overview.js
  2. 17 9
      views/map_overview.php

+ 24 - 26
public/js/app-map-overview.js

@@ -2,21 +2,28 @@
 var markerGroups = [];
 var infoWindow = false;
 
+const clearMarkers = key => {
+	if(typeof markerGroups[key] !== "undefined") {
+		for(let i in markerGroups[key]) {
+			if(markerGroups[key].hasOwnProperty(i)) {
+				let m = markerGroups[key][i];
+				m.setMap(null);
+			}
+		}
+	}
+};
+
 $(function() {
 
+	const $hideInactiveTestersSwitch = $("#hide-inactive-testers");
+	$hideInactiveTestersSwitch.on("change", () => loadAllAddresses());
+
 	// On customer select
 	$("a[data-customer-id]").on("click", function() {
 		let customerId = $(this).data("customer-id");
 
 		let key = "customer-" + customerId;
-		if(typeof markerGroups[key] !== "undefined") {
-			for(let i in markerGroups[key]) {
-				if(markerGroups[key].hasOwnProperty(i)) {
-					let m = markerGroups[key][i];
-					m.setMap(null);
-				}
-			}
-		}
+		clearMarkers(key);
 
 		let selected = $(this).data("selected");
 		if(selected) {
@@ -36,14 +43,7 @@ $(function() {
 		let projectId = $(this).data("project-id");
 
 		let key = "project-" + projectId;
-		if(typeof markerGroups[key] !== "undefined") {
-			for(let i in markerGroups[key]) {
-				if(markerGroups[key].hasOwnProperty(i)) {
-					let m = markerGroups[key][i];
-					m.setMap(null);
-				}
-			}
-		}
+		clearMarkers(key);
 
 		let selected = $(this).data("selected");
 		if(selected) {
@@ -59,16 +59,7 @@ $(function() {
 
 	// On all addresses select
 	$("a[data-all-addresses]").on("click", function() {
-
-		let key = "all-addresses";
-		if(typeof markerGroups[key] !== "undefined") {
-			for(let i in markerGroups[key]) {
-				if(markerGroups[key].hasOwnProperty(i)) {
-					let m = markerGroups[key][i];
-					m.setMap(null);
-				}
-			}
-		}
+		clearMarkers("all-addresses");
 
 		let selected = $(this).data("selected");
 		if(selected) {
@@ -232,7 +223,10 @@ function loadAllAddresses() {
 	 * @property {Boolean} response.success
 	 */
 
+	clearMarkers("all-addresses");
+
 	const $allAddresses = $("a[data-all-addresses]");
+	const hideInactive = $("#hide-inactive-testers").prop("checked");
 
 	$.get("/api/addresses/get-all", {
 		submit: $("#submit").val()
@@ -264,6 +258,10 @@ function loadAllAddresses() {
 				}
 			}
 
+			if(hideInactive && icon === "user-red.png") {
+				return;
+			}
+
 			let marker = new google.maps.Marker({
 				position: {
 					lat: address.latitude,

+ 17 - 9
views/map_overview.php

@@ -60,15 +60,23 @@
 	<div class="row">
 		<div class="col-md mb-3">
 
-			<h3>Testers</h3>
-			<div class="list-group mb-3">
-				<a class="list-group-item list-group-item-action d-flex justify-content-between" data-all-addresses data-selected="false">
-					<div>
-						All Tester Addresses
-					</div>
-					<span class="badge badge-pill badge-lg align-self-center"></span>
-				</a>
-			</div>
+			<section class="mb-4">
+				<h3>Testers</h3>
+
+				<div class="list-group mb-2">
+					<a class="list-group-item list-group-item-action d-flex justify-content-between" data-all-addresses data-selected="false">
+						<div>
+							All Tester Addresses
+						</div>
+						<span class="badge badge-pill badge-lg align-self-center"></span>
+					</a>
+				</div>
+
+				<div class="custom-control custom-switch">
+					<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>
+			</section>
 
 			<h3>Customers</h3>
 			<div class="list-group d-block">