Explorar el Código

Replaces location map with a minimap with location and user marker.

Alan Lam hace 8 años
padre
commit
a37c08b10e
Se han modificado 2 ficheros con 60 adiciones y 4 borrados
  1. 56 3
      public/js/app-project.js
  2. 4 1
      views/modal_assign_tester.php

+ 56 - 3
public/js/app-project.js

@@ -1,7 +1,11 @@
 var locationMarkers = [];
 var testerMarkers = [];
+var assignMarkers = [];
 
 var selectedLocation;
+var selectedTester;
+
+var assignLatLngBounds;
 
 var map = null;
 
@@ -12,6 +16,10 @@ $(function() {
 	$(document).on("click", "button[data-find-testers-button]", handleFindTestersButtonClick);
 	$(document).on("click", "button[data-assign-button]", handleAssignButtonClick);
 	$(document).on("click", "#assign-confirm-button", handleConfirmAssignButtonClick);
+	$("#modal-assign-tester").on("shown.bs.modal", function() {
+		console.log(assignLatLngBounds);
+		maps["assign-map"].fitBounds(assignLatLngBounds);
+	});
 });
 
 function initialiseLocations() {
@@ -111,7 +119,9 @@ function handleFindTestersButtonClick() {
 	var lng = parseFloat($(container).attr("data-longitude"));
 
 	selectedLocation = {
-		id: locationId
+		id: locationId,
+		lat: lat,
+		lng: lng
 	};
 
 	var latLng = {
@@ -237,6 +247,14 @@ function handleAssignButtonClick(event) {
 	let addressId = parseInt($(container).data("address-id"));
 	let testerId = parseInt($(container).data("tester-id"));
 
+	assignLatLngBounds = new google.maps.LatLngBounds;
+
+	for(var i in assignMarkers) {
+		let marker = assignMarkers[i];
+		marker.setMap(null);
+		marker = null;
+	}
+
 	// Find location
 	var location = false;
 	for(var i in locations) {
@@ -246,8 +264,26 @@ function handleAssignButtonClick(event) {
 		}
 	}
 
+	let map = maps["assign-map"];
+
 	if(location) {
-		$("#modal-assign-tester").find("[data-location-photo]").css("background-image", "url(/account/locations/" + location.id + "/photo)");
+
+		var position = {
+			lat: parseFloat(location.latitude),
+			lng: parseFloat(location.longitude)
+		};
+
+		assignLatLngBounds.extend(position);
+
+		let options = {};
+		options.map = map;
+		options.position = position;
+		options.icon = "/img/markers/building-green.png";
+		options.title = location.name;
+
+		let marker = new google.maps.Marker(options);
+		assignMarkers.push(marker);
+
 		$("#modal-assign-tester").find("[data-location-name]").text(location.name);
 		$("#modal-assign-tester").find("[data-location-address]").text(location.address);
 	}
@@ -255,12 +291,29 @@ function handleAssignButtonClick(event) {
 	// Find tester
 	var tester = false;
 	for(var i in testers) {
-		if(testers[i].id == testerId) {
+		if(testers[i].addressId == addressId) {
 			tester = testers[i];
 			break;
 		}
 	}
 	if(tester) {
+
+		var position = {
+			lat: parseFloat(tester.latitude),
+			lng: parseFloat(tester.longitude)
+		};
+
+		assignLatLngBounds.extend(position);
+
+		let options = {};
+		options.map = map;
+		options.position = position;
+		options.icon = "/img/markers/user-green.png";
+		options.title = tester.name;
+
+		let marker = new google.maps.Marker(options);
+		assignMarkers.push(marker);
+
 		$("#modal-assign-tester").find("[data-tester-photo]").css("background-image", "url(/account/users/" + tester.id + "/photo)");
 		$("#modal-assign-tester").find("[data-tester-name]").text(tester.name);
 		$("#modal-assign-tester").find("[data-tester-age]").text(tester.age);

+ 4 - 1
views/modal_assign_tester.php

@@ -26,7 +26,10 @@ $selected_day = date("j", $unix_default);
 								<div class="card-header">
 									Location Details
 								</div>
-								<img class="img-contain card-img-top" src="/img/blank_4_3.png" style="background-image: url(/img/no_image_4_3.png)" data-location-photo />
+								<div class="card-body p-0">
+									<div id="assign-map" style="height: 274.5px;" data-maps data-lat="51.3555177" data-lng="-1.1743197" data-zoom="15">
+									</div>
+								</div>
 								<div class="list-group list-group-flush">
 									<div class="list-group-item"><div class="row"><div class="col-sm-4">Location</div><div class="col-sm" data-location-name></div></div></div>
 									<div class="list-group-item"><div class="row"><div class="col-sm-4">Address</div><div class="col-sm" data-location-address></div></div></div>