Browse Source

Add functionality to find assigned test in list via the map marker

Alan Lam 6 years ago
parent
commit
0f8da1cdb4

+ 1 - 2
controllers/tests_tester_list.php

@@ -43,6 +43,7 @@ if(HTTP::isAJAX()) {
 				}
 
 				$output[] = (object) [
+					"id" => $test->id,
 					"status" => $test->getStatusText(),
 					"statusClass" => $test->getStatusClass(),
 					"name" => $location->name,
@@ -67,5 +68,3 @@ if(HTTP::isAJAX()) {
 
 View::includeOnce("header", compact("page_title"));
 View::include("test_list_assigned", compact("tests", "latitude", "longitude"));
-
-?>

+ 24 - 8
public/js/app-tests-tester-list.js

@@ -1,16 +1,32 @@
 $(function() {
 
+	const $testsList = $("#tests-list");
+
+	$(document).on("click", "[data-jump-button]", event => {
+
+		$("#tests-list > .list-group-item").removeClass("list-group-item-primary");
+
+		event.preventDefault();
+		const $button = $(event.currentTarget);
+		const id = $button.data("id");
+		const target = `#test-${id}`;
+		const $listGroupItem = $(target);
+		$listGroupItem.addClass("list-group-item-primary");
+		const top = $listGroupItem.offset().top - 56 - 45;
+		$("html, body").animate({
+			scrollTop: top
+		}, "fast")
+	});
 });
 
 var infoWindow = false;
 
 function initialiseMarkers() {
 
-	if(infoWindow == false) {
+	if(infoWindow === false) {
 		infoWindow = new google.maps.InfoWindow();
 	}
 
-
 	$.get(window.location, {
 		action: "get-tests"
 	}, function(response) {
@@ -22,6 +38,7 @@ function initialiseMarkers() {
 		let bounds = new google.maps.LatLngBounds();
 
 		for(let i in tests) {
+			if(!tests.hasOwnProperty(i)) continue;
 			let test = tests[i];
 			let latLng = {
 				lat: test.geolocation[0],
@@ -37,14 +54,15 @@ function initialiseMarkers() {
 			};
 
 			if(test.icon) {
-				markerOptions.icon = "/img/markers/" + test.icon + ".png";
+				markerOptions.icon = `/img/markers/${test.icon}.png`;
 			}
 
 			let marker = new google.maps.Marker(markerOptions);
 
 			marker.addListener("click", function() {
-				infoWindow.setContent("<strong>" + test.name + "</strong> " + "<span class=\"badge badge-" + test.statusClass + "\">" + test.status + "</span>" + "<br />" +
-				"<small>" + test.address + "</small>"
+				infoWindow.setContent(`<strong>${test.name}</strong> <span class="badge badge-${test.statusClass}">${test.status}</span><br />
+<small>${test.address}</small><br />
+<a data-jump-button data-id="${test.id}" href="#">Find in List</a>`
 				);
 				infoWindow.open(map, marker);
 			});
@@ -53,7 +71,5 @@ function initialiseMarkers() {
 
 		map.fitBounds(bounds);
 
-
-
 	});
-}
+}

+ 7 - 7
views/test_list_assigned.php

@@ -46,7 +46,7 @@
 		<div class="mb-3" id="map" data-maps data-lat="<?=$latitude?>" data-lng="<?=$longitude?>" data-zoom="7" data-callback="initialiseMarkers" style="height: 24rem; width: 100%;">
 		</div>
 
-		<div class="list-group">
+		<div id="tests-list" class="list-group">
 
 		<?php
 		foreach($tests as $test) {
@@ -67,7 +67,7 @@
 			if($is_unverified) $status_text = "Unverified";
 
 			?>
-			<div class="list-group-item">
+			<div class="list-group-item" id="test-<?=$test->id?>">
 				<div class="row">
 					<div class="col-lg-4">
 						<?=htmlspecialchars($location->name)?><br />
@@ -88,23 +88,23 @@
 							<?php
 							if($is_assigned) {
 								?>
-								<a class="btn btn-outline-success" href="/account/tests/<?=$test->id?>/accept"><?=htmlspecialchars(__("Accept"))?></a>
-								<a class="btn btn-outline-danger" href="/account/tests/<?=$test->id?>/decline"><?=htmlspecialchars(__("Decline"))?></a>
+								<a class="btn btn-success" href="/account/tests/<?=$test->id?>/accept"><?=htmlspecialchars(__("Accept"))?></a>
+								<a class="btn btn-danger" href="/account/tests/<?=$test->id?>/decline"><?=htmlspecialchars(__("Decline"))?></a>
 								<?php
 							}
 							else if($is_confirmed) {
 								?>
-								<a class="btn btn-outline-primary" href="/account/tests/<?=$test->id?>"><?=htmlspecialchars(__("Begin"))?></a>
+								<a class="btn btn-primary" href="/account/tests/<?=$test->id?>"><?=htmlspecialchars(__("Begin"))?></a>
 								<?php
 							}
 							else if($is_started) {
 								?>
-								<a class="btn btn-outline-primary" href="/account/tests/<?=$test->id?>"><?=htmlspecialchars(__("Continue"))?></a>
+								<a class="btn btn-primary" href="/account/tests/<?=$test->id?>"><?=htmlspecialchars(__("Continue"))?></a>
 								<?php
 							}
 							else if($is_unverified) {
 								?>
-								<a class="btn btn-outline-primary" href="/account/tests/<?=$test->id?>"><?=htmlspecialchars(__("Amend"))?></a>
+								<a class="btn btn-primary" href="/account/tests/<?=$test->id?>"><?=htmlspecialchars(__("Amend"))?></a>
 								<?php
 							}
 							?>