Parcourir la source

Adds support for address markers in Map Overview.

Alan Lam il y a 8 ans
Parent
commit
7977309f22
4 fichiers modifiés avec 130 ajouts et 3 suppressions
  1. 37 0
      controllers/addresses_ajax.php
  2. 80 3
      public/js/app-map-overview.js
  3. 2 0
      routes.php
  4. 11 0
      views/map_overview.php

+ 37 - 0
controllers/addresses_ajax.php

@@ -0,0 +1,37 @@
+<?php
+
+JSON::header();
+
+switch($action) {
+	case "get-all":
+
+		$users = User::query(["level" => User::LEVEL_TESTER]);
+		$user_ids = array_column($users, "id");
+		$users = array_combine($user_ids, $users);
+
+		$addresses = UserAddress::query([
+			"user_id" => $user_ids
+		]);
+
+		$output = [];
+
+		foreach($addresses as $address) {
+
+			$user = $users[$address->user_id];
+
+
+			$output[] = [
+				"id" => $address->id,
+				"userId" => $address->user_id,
+				"name" => $user->getDisplayName(),
+				"latitude" => (float) $address->latitude,
+				"longitude" => (float) $address->longitude
+			];
+		}
+
+		JSON::success([
+			"addresses" => $output
+		]);
+
+		break;
+}

+ 80 - 3
public/js/app-map-overview.js

@@ -49,6 +49,28 @@ $(function() {
 		return false;
 	});
 
+	$("a[data-all-addresses]").click(function(event) {
+
+		let key = "all-addresses";
+		if(typeof markerGroups[key] !== "undefined") {
+			for(let i in markerGroups[key]) {
+				let m = markerGroups[key][i];
+				m.setMap(null);
+			}
+		}
+
+		let selected = $(this).data("selected");
+		if(selected) {
+			$(this).data("selected", false);
+			$(this).find(".badge").removeClass("badge-success").text("");
+		}
+		else {
+			loadAllAddresses();
+		}
+
+		return false;
+	});
+
 });
 
 function loadCustomerLocations(customerId) {
@@ -87,7 +109,7 @@ function loadCustomerLocations(customerId) {
 			infoWindow.setContent("");
 
 			let marker = new google.maps.Marker(options);
-			addMarkerClickListener(marker, l);
+			addMarkerClickListenerForLocation(marker, l);
 
 			markerGroups[key].push(marker);
 		}
@@ -134,7 +156,7 @@ function loadProjectLocations(projectId) {
 			if(l.icon) options.icon = l.icon;
 
 			let marker = new google.maps.Marker(options);
-			addMarkerClickListener(marker, l);
+			addMarkerClickListenerForLocation(marker, l);
 
 			markerGroups[key].push(marker);
 
@@ -146,7 +168,51 @@ function loadProjectLocations(projectId) {
 	});
 }
 
-function addMarkerClickListener(m, l) {
+function loadAllAddresses() {
+
+	if(infoWindow == false) {
+		infoWindow = new google.maps.InfoWindow();
+	}
+
+	$.get("/api/addresses/get-all", {
+		submit: $("#submit").val()
+	}, function(response) {
+		if(!response.success) return false;
+
+		let map = maps["map"];
+		let key = "all-addresses";
+
+		markerGroups[key] = [];
+
+		for(let i in response.addresses) {
+
+			let a = response.addresses[i];
+
+			let position = {
+				lat: a.latitude,
+				lng: a.longitude
+			};
+
+			var options = {
+				position: position,
+				title: a.name,
+				map: map
+			};
+
+			let marker = new google.maps.Marker(options);
+			addMarkerClickListenerForAddress(marker, a);
+
+			markerGroups[key].push(marker);
+
+		}
+
+		$("a[data-all-addresses]").data("selected", true);
+		$("a[data-all-addresses]").find(".badge").addClass("badge-danger").text(response.addresses.length);
+
+	});
+}
+
+function addMarkerClickListenerForLocation(m, l) {
 	let map = maps["map"];
 	m.addListener("click", function() {
 		let content = "<strong><a href=\"/account/locations/" + l.id + "\" target=\"_blank\">" + l.name + "</a></strong><br />";
@@ -159,3 +225,14 @@ function addMarkerClickListener(m, l) {
 		infoWindow.open(map, m);
 	});
 }
+
+function addMarkerClickListenerForAddress(m, a) {
+	let map = maps["map"];
+	m.addListener("click", function() {
+		let content = "<strong><a href=\"/account/users/" + a.userId + "\" target=\"_blank\">" + a.name + "</a></strong><br />";
+		content += "ID: " + a.userId + "<br />";
+
+		infoWindow.setContent(content);
+		infoWindow.open(map, m);
+	});
+}

+ 2 - 0
routes.php

@@ -44,6 +44,8 @@ $routes = [
 	"/^account\/addresses\/add$/" => ["controller" => "address_add", "require_log_in" => true],
 	"/^account\/addresses\/edit\/$id_pattern$/" => ["controller" => "address_edit", "params" => ["id"], "require_log_in" => true],
 
+	"/^api\/addresses\/(get-all)$/" => ["controller" => "addresses_ajax", "params" => ["action"], "require_user_level" => User::LEVEL_ADMIN],
+
 	// Map Overview
 	"/^account\/map-overview$/" => ["controller" => "map_overview", "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/map-overview\/(get-customer-locations|get-project-locations)$/" => ["controller" => "map_overview_ajax", "params" => ["action"], "require_user_level" => User::LEVEL_ADMIN],

+ 11 - 0
views/map_overview.php

@@ -41,6 +41,17 @@
 			?>
 			</div>
 		</div>
+		<div class="col-sm mb-3">
+			<h3>Testers</h3>
+			<div class="list-group">
+				<a class="list-group-item list-group-item-action d-flex justify-content-between" data-all-addresses data-selected="false">
+					<div>
+						All Addresses
+					</div>
+					<span class="badge badge-pill badge-lg align-self-center"></span>
+				</a>
+			</div>
+		</div>
 	</div>
 
 </div>