Parcourir la source

Add legend next to "Map Overview" and "Locations" pages

Alan Lam il y a 3 ans
Parent
commit
4b7beff9ac
3 fichiers modifiés avec 47 ajouts et 2 suppressions
  1. 12 0
      views/legend_locations.php
  2. 13 1
      views/locations.php
  3. 22 1
      views/map_overview.php

+ 12 - 0
views/legend_locations.php

@@ -0,0 +1,12 @@
+<div class="mb-3">
+	<strong>Locations (Status)</strong>
+
+	<div><i class="fa fa-fw fa-square text-secondary"></i> None</div>
+	<div><i class="fa fa-fw fa-square text-success"></i> Pass</div>
+	<div><i class="fa fa-fw fa-square text-danger"></i> Fail</div>
+	<div><i class="fa fa-fw fa-square text-primary"></i> Overdue</div>
+	<div><i class="fa fa-fw fa-square text-warning"></i> Pending</div>
+
+	<div><i class="fa fa-fw fa-minus-circle text-danger"></i> Closed</div>
+	<div><i class="fa fa-fw fa-exclamation-circle text-warning"></i> Do Not Test</div>
+</div>

+ 13 - 1
views/locations.php

@@ -171,8 +171,20 @@ var customerId = <?=$customer->id?>;
 			<span id="map-marker-count" class="badge badge-pill badge-primary"></span>
 		</h3>
 
-		<div class="mb-3" id="map" data-maps data-lat="0" data-lng="0" data-zoom="7" style="height: 480px;" data-callback="initialiseLocations">
+		<div class="form-row">
+			<div class="col-md">
+				<div class="mb-3" id="map" data-maps data-lat="0" data-lng="0" data-zoom="7" style="height: 480px;" data-callback="initialiseLocations">
+				</div>
+			</div>
+			<div class="col-md-auto small">
+				<h5>Legend</h5>
+
+				<?php
+				View::include("legend_locations");
+				?>
+			</div>
 		</div>
+
 		<?php
 	}
 	?>

+ 22 - 1
views/map_overview.php

@@ -34,7 +34,28 @@
 		</div>
 	</div>
 
-	<div class="mb-4" id="map" data-maps data-lat="51.3555177" data-lng="-1.1743197" data-zoom="7" style="height: 512px;"></div>
+	<div class="form-row mb-4">
+		<div class="col-md">
+			<div class="mb-4" id="map" data-maps data-lat="51.3555177" data-lng="-1.1743197" data-zoom="7" style="height: 512px;"></div>
+		</div>
+		<div class="col-md-auto text-nowrap small">
+			<h5>Legend</h5>
+
+			<?php
+			View::include("legend_locations");
+			?>
+
+			<div class="mb-3">
+				<strong>Testers (Last Test)</strong>
+
+				<div><i class="fa fa-fw fa-square text-success"></i> &lt; 30 days ago</div>
+				<div><i class="fa fa-fw fa-square text-warning"></i> &lt; 60 days ago</div>
+				<div><i class="fa fa-fw fa-square text-secondary"></i> &lt; 90 days ago</div>
+				<div><i class="fa fa-fw fa-square text-danger"></i> &gt; 90 days ago or never</div>
+			</div>
+		</div>
+	</div>
+
 
 	<div class="row">
 		<div class="col-md mb-3">