Kaynağa Gözat

Add radius circle to project page

Alan Lam 3 yıl önce
ebeveyn
işleme
889761575d
4 değiştirilmiş dosya ile 112 ekleme ve 41 silme
  1. 69 35
      public/js/app-project.js
  2. 11 0
      public/js/app.js
  3. 29 5
      views/project.php
  4. 3 1
      views/test_list.php

+ 69 - 35
public/js/app-project.js

@@ -2,7 +2,6 @@ var locationMarkers = [];
 var assignMarkers = [];
 var assignMarkers = [];
 
 
 var selectedLocation = false;
 var selectedLocation = false;
-var selectedTester;
 
 
 var locationLatLngBounds;
 var locationLatLngBounds;
 var assignLatLngBounds;
 var assignLatLngBounds;
@@ -10,18 +9,23 @@ var assignLatLngBounds;
 var map = null;
 var map = null;
 var infoWindow = false;
 var infoWindow = false;
 var markerClusterer = false;
 var markerClusterer = false;
+let radiusCircle;
 
 
 var locations = [];
 var locations = [];
 var testers = [];
 var testers = [];
 
 
 $(function() {
 $(function() {
 	$(document).on("click", "button[data-find-testers-button]", handleFindTestersButtonClick);
 	$(document).on("click", "button[data-find-testers-button]", handleFindTestersButtonClick);
+
 	$(document).on("click", "button[data-assign-button]", handleAssignButtonClick);
 	$(document).on("click", "button[data-assign-button]", handleAssignButtonClick);
+
 	$(document).on("click", "#assign-confirm-button", handleConfirmAssignButtonClick);
 	$(document).on("click", "#assign-confirm-button", handleConfirmAssignButtonClick);
+
 	$("#modal-assign-tester").on("shown.bs.modal", function() {
 	$("#modal-assign-tester").on("shown.bs.modal", function() {
 		maps["assign-map"].fitBounds(assignLatLngBounds);
 		maps["assign-map"].fitBounds(assignLatLngBounds);
 	});
 	});
-	$("input[data-filter-target]").keyup(function(event) {
+
+	$("input[data-filter-target]").keyup(function() {
 
 
 		let value = $(this).val().toLowerCase();
 		let value = $(this).val().toLowerCase();
 		let target = $(this).data("filter-target");
 		let target = $(this).data("filter-target");
@@ -56,14 +60,32 @@ $(function() {
 
 
 		return true;
 		return true;
 	});
 	});
+
 	$("#testers-max-distance, #testers-include-unverified, #testers-minimum-score").on("change", function() {
 	$("#testers-max-distance, #testers-include-unverified, #testers-minimum-score").on("change", function() {
 		if(selectedLocation) {
 		if(selectedLocation) {
 			clearTesters();
 			clearTesters();
 			initialiseTesters();
 			initialiseTesters();
 		}
 		}
 	});
 	});
+
+	// Auto-select Location
+	const autoSelectLocationId = $("#auto-select-location-id").val();
+	if(autoSelectLocationId) {
+		const interval = setInterval(() => {
+			const $tr = $(`tr[data-location-id='${autoSelectLocationId}']`);
+			if($tr.length > 0) {
+				$tr.find("[data-find-testers-button]").trigger("click");
+				clearInterval(interval);
+			}
+		}, 1000);
+	}
 });
 });
 
 
+function clearMarkers() {
+	locationMarkers.forEach(marker => marker.setMap(null));
+	locationMarkers = [];
+}
+
 function initialiseLocations() {
 function initialiseLocations() {
 
 
 	if(!infoWindow) {
 	if(!infoWindow) {
@@ -72,11 +94,16 @@ function initialiseLocations() {
 
 
 	map = maps["map"];
 	map = maps["map"];
 
 
-	for(let i in locationMarkers) {
-		let marker = locationMarkers[i];
-		marker.setMap(null);
+	if(!radiusCircle) {
+		radiusCircle = new google.maps.Circle({
+			map: map,
+			radius: 8064,
+			strokeOpacity: 0.25,
+			fillOpacity: 0.125
+		});
 	}
 	}
-	locationMarkers = [];
+
+	clearMarkers();
 
 
 	$.get("/account/projects/" + projectID + "/get-locations", {
 	$.get("/account/projects/" + projectID + "/get-locations", {
 		submit: $("#submit").val()
 		submit: $("#submit").val()
@@ -94,9 +121,7 @@ function initialiseLocations() {
 		var pendingVerificationCount = "";
 		var pendingVerificationCount = "";
 		var completedCount = "";
 		var completedCount = "";
 
 
-		for(let i in response.locations) {
-			let location = response.locations[i];
-
+		response.locations.forEach(location => {
 			let position = {
 			let position = {
 				lat: location.latitude,
 				lat: location.latitude,
 				lng: location.longitude
 				lng: location.longitude
@@ -106,7 +131,8 @@ function initialiseLocations() {
 
 
 			let cssClass = location.class;
 			let cssClass = location.class;
 
 
-			let icon = "/img/markers/building-grey.png";
+			let icon;
+
 			if(cssClass == "danger") {
 			if(cssClass == "danger") {
 				icon = "/img/markers/building-red.png";
 				icon = "/img/markers/building-red.png";
 				unassignedCount++;
 				unassignedCount++;
@@ -143,57 +169,58 @@ function initialiseLocations() {
 			// Populate table
 			// Populate table
 			var tr = $("<tr data-location-id=\"" + location.id + "\" data-internal-id=\"" + location.internalId + "\" data-tester-id=\"" + location.testerId + "\" data-latitude=\"" + location.latitude + "\" data-longitude=\"" + location.longitude + "\" data-filter-value=\"" + filterValue + "\"></tr>");
 			var tr = $("<tr data-location-id=\"" + location.id + "\" data-internal-id=\"" + location.internalId + "\" data-tester-id=\"" + location.testerId + "\" data-latitude=\"" + location.latitude + "\" data-longitude=\"" + location.longitude + "\" data-filter-value=\"" + filterValue + "\"></tr>");
 
 
-			var td = $("<td class=\"text-right\"></td>");
-			td.append(location.id);
-			tr.append(td);
+			var locationIdTd = $("<td class=\"text-right\"></td>");
+			locationIdTd.append(location.id);
+			tr.append(locationIdTd);
 
 
 			var a = $("<a>").attr("href", "/account/locations/" + location.id).attr("target", "_blank").text(location.name);
 			var a = $("<a>").attr("href", "/account/locations/" + location.id).attr("target", "_blank").text(location.name);
 
 
-			var td = $("<td></td>");
-			td.append(a);
+			var locationNameTd = $("<td></td>");
+			locationNameTd.append(a);
 
 
 			if(location.retest) {
 			if(location.retest) {
-				td.append(" <span class=\"badge badge-primary\">Retest</span>");
+				locationNameTd.append(" <span class=\"badge badge-primary\">Retest</span>");
 			}
 			}
 
 
-			td.append("<br />");
+			locationNameTd.append("<br />");
 
 
 			if(location.internalId) {
 			if(location.internalId) {
 				var small = $("<span class=\"text-info\">").text("Internal ID: " + location.internalId);
 				var small = $("<span class=\"text-info\">").text("Internal ID: " + location.internalId);
-				td.append(small);
-				td.append("<br />");
+				locationNameTd.append(small);
+				locationNameTd.append("<br />");
 			}
 			}
 
 
 			var address = $("<span>").text(location.address1);
 			var address = $("<span>").text(location.address1);
 
 
-			td.append(address);
-			tr.append(td);
+			locationNameTd.append(address);
+			tr.append(locationNameTd);
 
 
-			var td = $("<td>").addClass("align-middle").addClass("text-center");
-			td.append($("<span>").addClass("badge").addClass("badge-" + cssClass).text(location.statusText));
-			tr.append(td);
+			var statusTd = $("<td>").addClass("align-middle").addClass("text-center");
+			statusTd.append($("<span>").addClass("badge").addClass("badge-" + cssClass).text(location.statusText));
+			tr.append(statusTd);
 
 
-			var td = $("<td>").addClass("align-middle").addClass("text-center").addClass("text-" + location.passClass);
+			var passTd = $("<td>").addClass("align-middle").addClass("text-center").addClass("text-" + location.passClass);
 			var div = $("<div>").attr("title", location.passText).attr("data-toggle", "tooltip");
 			var div = $("<div>").attr("title", location.passText).attr("data-toggle", "tooltip");
 			div.append($("<i>").addClass().addClass("fas").addClass("fa-fw").addClass("fa-" + location.passIcon));
 			div.append($("<i>").addClass().addClass("fas").addClass("fa-fw").addClass("fa-" + location.passIcon));
-			td.append(div);
-			tr.append(td);
+			passTd.append(div);
+			tr.append(passTd);
 			div.tooltip();
 			div.tooltip();
 
 
-			var td = $("<td>").addClass("align-middle").addClass("text-right");
+			var buttonTd = $("<td>").addClass("align-middle").addClass("text-right");
+			let button;
 			if(cssClass == "danger" || cssClass == "warning") {
 			if(cssClass == "danger" || cssClass == "warning") {
-				var button = $("<button data-find-testers-button title=\"Find Testers\" data-toggle=\"tooltip\">").addClass("btn").addClass("btn-outline-primary").html("<i class=\"fal fa-fw fa-search\"></i>").tooltip();
+				button = $("<button data-find-testers-button title=\"Find Testers\" data-toggle=\"tooltip\">").addClass("btn").addClass("btn-outline-primary").html("<i class=\"fal fa-fw fa-search\"></i>").tooltip();
 			}
 			}
 			else {
 			else {
-				var button = $("<a class=\"btn btn-outline-success\" href=\"/account/tests/" + location.testId + "\" title=\"View Test\" data-toggle=\"tooltip\" >").html("<i class=\"fal fa-fw fa-clipboard-check\"></i>").tooltip();
+				button = $("<a class=\"btn btn-outline-success\" href=\"/account/tests/" + location.testId + "\" title=\"View Test\" data-toggle=\"tooltip\" >").html("<i class=\"fal fa-fw fa-clipboard-check\"></i>").tooltip();
 			}
 			}
 
 
-			td.append(button);
-			tr.append(td);
+			buttonTd.append(button);
+			tr.append(buttonTd);
 
 
 			$("#tests-tbody").append(tr);
 			$("#tests-tbody").append(tr);
 
 
-		}
+		});
 
 
 		map.fitBounds(locationLatLngBounds);
 		map.fitBounds(locationLatLngBounds);
 
 
@@ -227,7 +254,14 @@ function handleFindTestersButtonClick() {
 		lng: lng
 		lng: lng
 	};
 	};
 
 
-	map.panTo(latLng);
+	const interval = setInterval(() => {
+		if(map !== null) {
+			map.panTo(latLng);
+			map.setZoom(12);
+			radiusCircle.setCenter(latLng);
+			clearInterval(interval);
+		}
+	}, 250);
 
 
 	clearTesters();
 	clearTesters();
 	initialiseTesters();
 	initialiseTesters();
@@ -439,7 +473,7 @@ function handleTesterClick() {
 	infoWindow.open(map, this);
 	infoWindow.open(map, this);
 }
 }
 
 
-function handleAssignButtonClick(event) {
+function handleAssignButtonClick() {
 	let container = $(this).closest("[data-address-id]");
 	let container = $(this).closest("[data-address-id]");
 
 
 	let addressId = parseInt($(container).data("address-id"));
 	let addressId = parseInt($(container).data("address-id"));

+ 11 - 0
public/js/app.js

@@ -105,6 +105,17 @@ function initialiseMaps() {
 		options.zoom = $(this).data("zoom");
 		options.zoom = $(this).data("zoom");
 		options.gestureHandling = "greedy";
 		options.gestureHandling = "greedy";
 		options.scaleControl = true;
 		options.scaleControl = true;
+		options.styles = [
+			{
+				featureType: "poi",
+				elementType: "labels",
+				stylers: [
+					{
+						visibility: "off"
+					}
+				]
+			}
+		];
 
 
 		let map = new google.maps.Map(this, options);
 		let map = new google.maps.Map(this, options);
 
 

+ 29 - 5
views/project.php

@@ -1,4 +1,18 @@
-<?php
+<?php /** @noinspection PhpUnhandledExceptionInspection */
+
+/**
+ * @var Project $project
+ * @var int $completed_percentage
+ * @var int $pass_count
+ * @var int $fail_count
+ * @var float $pass_percentage
+ * @var int $fail_percentage
+ * @var string $deadline_date
+ * @var int $created_test_count
+ * @var int $completed_test_count
+ * @var float $latitude
+ * @var float $longitude
+ */
 
 
 $time_of_day_icon = $project->getTimeOfDayIcon();
 $time_of_day_icon = $project->getTimeOfDayIcon();
 $time_of_day_text = $project->getTimeOfDayText();
 $time_of_day_text = $project->getTimeOfDayText();
@@ -7,6 +21,8 @@ $template_keys = $project->getTemplateKeys();
 
 
 $user = Core::$user;
 $user = Core::$user;
 
 
+$auto_select_location_id = http::value("location_id", "int");
+
 ?>
 ?>
 
 
 <script>
 <script>
@@ -15,6 +31,14 @@ var projectID = <?=$project->id?>;
 
 
 <input type="hidden" id="submit" value="<?=$_SESSION["csrf_token"]?>" />
 <input type="hidden" id="submit" value="<?=$_SESSION["csrf_token"]?>" />
 
 
+<?php
+if($auto_select_location_id) {
+	?>
+	<input type="hidden" id="auto-select-location-id" value="<?=$auto_select_location_id?>" />
+	<?php
+}
+?>
+
 <div class="container pt-3 my-4">
 <div class="container pt-3 my-4">
 	<div class="row">
 	<div class="row">
 		<div class="col-auto">
 		<div class="col-auto">
@@ -105,7 +129,7 @@ var projectID = <?=$project->id?>;
 				<div class="card-body">
 				<div class="card-body">
 					Pass/Fail Ratio (including Unverified)
 					Pass/Fail Ratio (including Unverified)
 					<div class="stat mb-3">
 					<div class="stat mb-3">
-						<?=number_format($pass_count)?> Pass / <?=number_format($fail_count)?> Fail (<?=intval($pass_percentage)?>%)
+						<?=number_format($pass_count)?> Pass / <?=number_format($fail_count)?> Fail (<?=(int) $pass_percentage?>%)
 					</div>
 					</div>
 					<div class="progress">
 					<div class="progress">
 						<div class="progress-bar bg-success" role="progressbar" style="width: <?=$pass_percentage?>%"></div>
 						<div class="progress-bar bg-success" role="progressbar" style="width: <?=$pass_percentage?>%"></div>
@@ -176,11 +200,11 @@ var projectID = <?=$project->id?>;
 
 
 			<div class="input-group mb-3">
 			<div class="input-group mb-3">
 				<div class="input-group-prepend">
 				<div class="input-group-prepend">
-					<span class="input-group-text">
+					<label for="filter" class="input-group-text">
 						Filter
 						Filter
-					</span>
+					</label>
 				</div>
 				</div>
-				<input class="form-control" type="text" placeholder="Enter name, address, ID or internal ID" data-filter-target="#tests-tbody" />
+				<input class="form-control" id="filter" type="text" placeholder="Enter name, address, ID or internal ID" data-filter-target="#tests-tbody" />
 			</div>
 			</div>
 
 
 			<div class="limit-height-2">
 			<div class="limit-height-2">

+ 3 - 1
views/test_list.php

@@ -330,7 +330,9 @@ foreach($projects as $project) {
 									<?=htmlspecialchars($location->getDisplayAddress(["address_1", "address_2", "city"]))?>
 									<?=htmlspecialchars($location->getDisplayAddress(["address_1", "address_2", "city"]))?>
 								</td>
 								</td>
 								<td class="align-middle">
 								<td class="align-middle">
-									<a href="/account/projects/<?=$project->id?>"><?=htmlspecialchars($project->name)?></a><br />
+									<a href="/account/projects/<?=$project->id?>?location_id=<?=$test->location_id?>">
+										<?=htmlspecialchars($project->name)?>
+									</a><br />
 									<strong>Deadline:</strong> <?=date("d/m/Y", strtotime($project->dts_deadline . " UTC"))?>
 									<strong>Deadline:</strong> <?=date("d/m/Y", strtotime($project->dts_deadline . " UTC"))?>
 								</td>
 								</td>
 								<td class="align-middle">
 								<td class="align-middle">