Răsfoiți Sursa

Added address map to user page.

Alan Lam 8 ani în urmă
părinte
comite
fc6617301b
3 a modificat fișierele cu 58 adăugiri și 10 ștergeri
  1. 2 0
      controllers/user.php
  2. 36 0
      public/js/app-user.js
  3. 20 10
      views/user.php

+ 2 - 0
controllers/user.php

@@ -1,5 +1,7 @@
 <?php
 
+Core::addScript("public/js/app-user.js");
+
 $user = User::get($id);
 if(!$user) throw new Exception("User not found.");
 

+ 36 - 0
public/js/app-user.js

@@ -0,0 +1,36 @@
+function initialiseAddresses() {
+
+	$.get("/api/users/" + userId + "/get-addresses", {
+	}, function(response) {
+		if(!response.success) return false;
+		if(!response.addresses) return false;
+
+		let map = maps["map"];
+
+		let bounds = new google.maps.LatLngBounds;
+
+		for(let i in response.addresses) {
+
+			let address = response.addresses[i];
+			let position = {
+				lat: address.latitude,
+				lng: address.longitude
+			};
+
+			let options = {
+				map: map,
+				position: position,
+				title: address.name
+			}
+
+			bounds.extend(position);
+
+			let marker = new google.maps.Marker(options);
+
+		}
+
+		map.fitBounds(bounds);
+
+	});
+
+}

+ 20 - 10
views/user.php

@@ -17,6 +17,9 @@ $pending_tests = $user->getPendingTests();
 $completed_tests = $user->getCompletedTests();
 
 ?>
+<script>
+var userId = <?=$user->id?>;
+</script>
 
 <div class="container mt-3 py-4">
 	<div class="row">
@@ -83,17 +86,24 @@ $completed_tests = $user->getCompletedTests();
 	}
 	else {
 		?>
-		<div class="list-group mb-4">
-		<?php
-		foreach($addresses as $address) {
-			?>
-			<div class="list-group-item">
-				<strong><?=htmlspecialchars($address->name)?></strong><br />
-				<?=htmlspecialchars($address->getDisplayAddress())?>
+		<div class="row">
+			<div class="col-lg-6 mb-4">
+				<div class="list-group">
+				<?php
+				foreach($addresses as $address) {
+					?>
+					<div class="list-group-item">
+						<strong><?=htmlspecialchars($address->name)?></strong><br />
+						<small><?=htmlspecialchars($address->getDisplayAddress())?></small>
+					</div>
+					<?php
+				}
+				?>
+				</div>
+			</div>
+			<div class="col-lg-6 mb-4">
+				<div id="map" style="height: 248px;" data-maps data-lat="0" data-lng="0" data-zoom="5" data-callback="initialiseAddresses"></div>
 			</div>
-			<?php
-		}
-		?>
 		</div>
 		<?php
 	}