Sfoglia il codice sorgente

Add more details to tester address markers in Map Overview

Alan Lam 6 anni fa
parent
commit
5eb811d5c0
2 ha cambiato i file con 51 aggiunte e 6 eliminazioni
  1. 34 4
      controllers/addresses_ajax.php
  2. 17 2
      public/js/app-map-overview.js

+ 34 - 4
controllers/addresses_ajax.php

@@ -1,5 +1,7 @@
 <?php
 
+$user = Core::$user;
+
 JSON::header();
 
 switch($action) {
@@ -13,19 +15,47 @@ switch($action) {
 			"user_id" => $user_ids
 		]);
 
+		$tests = Test::query([
+			"tester_id" => $user_ids,
+			"status" => Test::STATUS_COMPLETED
+		]);
+
+		$user_test_timestamps = [];
+		foreach($tests as $test) {
+			$timestamp = $user_test_timestamps[$test->tester_id] ?? 0;
+			$dt_start = new DateTime($test->dts_start, new DateTimeZone("UTC"));
+			$test_timestamp = $dt_start->getTimestamp();
+			if($test_timestamp < $timestamp) continue;
+			$user_test_timestamps[$test->tester_id] = $test_timestamp;
+		}
+
 		$output = [];
 
 		foreach($addresses as $address) {
 
 			$user = $users[$address->user_id];
 
+			$dt_registered = new DateTime($user->dts_registered, new DateTimeZone("UTC"));
+
+			$last_test_timestamp = $user_test_timestamps[$address->user_id] ?? null;
+			$last_test_date = null;
+			if($last_test_timestamp) {
+				$dt_last_test = DateTime::createFromFormat("U", $last_test_timestamp, new DateTimeZone(TIMEZONE));
+				$date_last_test = $dt_last_test->format("d/m/Y");
+			}
 
 			$output[] = [
-				"id" => $address->id,
-				"userId" => $address->user_id,
+				"id" => (int) $address->id,
+				"userId" => (int) $address->user_id,
 				"name" => $user->getDisplayName(),
 				"latitude" => (float) $address->latitude,
-				"longitude" => (float) $address->longitude
+				"longitude" => (float) $address->longitude,
+				"user" => [
+					"id" => (int) $user->id,
+					"score" => (int) $user->score,
+					"dateRegistered" => $dt_registered->format("d/m/Y"),
+					"dateLastTest" => $date_last_test,
+				]
 			];
 		}
 
@@ -34,4 +64,4 @@ switch($action) {
 		]);
 
 		break;
-}
+}

+ 17 - 2
public/js/app-map-overview.js

@@ -308,8 +308,23 @@ function addMarkerClickListenerForLocation(marker, location) {
 function addMarkerClickListenerForAddress(marker, address) {
 	let map = maps["map"];
 	marker.addListener("click", function() {
-		let content = "<strong><a href=\"/account/users/" + address.userId + "\" target=\"_blank\">" + address.name + "</a></strong><br />";
-		content += "ID: " + address.userId + "<br />";
+
+		let dateLastTest = address.user.dateLastTest;
+		if(dateLastTest === null) {
+			dateLastTest = "Never";
+		}
+
+		const content = `
+<div class="text-center mb-2">
+	<strong><a href="/account/users/${address.userId}" target="_blank">${address.name}</a></strong>
+</div>
+<table class="table small table-sm mb-0">
+	<tr><th>ID</th><td class="text-right">${address.user.id}</td></tr>
+	<tr><th>Score</th><td class="text-right">${address.user.score}</td></tr>
+	<tr><th>Last Test</th><td class="text-right">${dateLastTest}</td></tr>
+	<tr><th>Registered</th><td class="text-right">${address.user.dateRegistered}</td></tr>
+</table>
+`;
 
 		infoWindow.setContent(content);
 		infoWindow.open(map, marker);