Alan Lam 8 лет назад
Родитель
Сommit
a9f006a862
2 измененных файлов с 37 добавлено и 15 удалено
  1. 27 4
      public/js/app-project.js
  2. 10 11
      views/project.php

+ 27 - 4
public/js/app-project.js

@@ -79,6 +79,11 @@ function initialiseLocations() {
 
 		locationLatLngBounds = new google.maps.LatLngBounds;
 
+		var unassignedCount = "";
+		var assignedCount = "";
+		var pendingVerificationCount = "";
+		var completedCount = "";
+
 		for(let i in response.locations) {
 			let location = response.locations[i];
 
@@ -92,10 +97,22 @@ function initialiseLocations() {
 			let cssClass = location.class;
 
 			let icon = "/img/markers/building-grey.png";
-			if(cssClass == "danger") icon = "/img/markers/building-red.png";
-			else if(cssClass == "primary") icon = "/img/markers/building-blue.png";
-			else if(cssClass == "success") icon = "/img/markers/building-green.png";
-			else icon = "/img/markers/building-orange.png";
+			if(cssClass == "danger") {
+				icon = "/img/markers/building-red.png";
+				unassignedCount++;
+			}
+			else if(cssClass == "primary") {
+				icon = "/img/markers/building-blue.png";
+				assignedCount++;
+			}
+			else if(cssClass == "success") {
+				icon = "/img/markers/building-green.png";
+				completedCount++;
+			}
+			else {
+				icon = "/img/markers/building-orange.png";
+				assignedCount++;
+			}
 
 			let options = {};
 			options.position = position;
@@ -157,6 +174,12 @@ function initialiseLocations() {
 		}
 
 		map.fitBounds(locationLatLngBounds);
+
+		$("#unassigned-count").text(unassignedCount);
+		$("#assigned-count").text(assignedCount);
+		$("#pending-verification-count").text(pendingVerificationCount);
+		$("#completed-count").text(completedCount);
+
 	});
 }
 

+ 10 - 11
views/project.php

@@ -56,8 +56,7 @@ var projectID = <?=$project->id?>;
 				</div>
 			</div>
 		</div>
-		<div class="col-md-6">
-
+		<div class="col-md-6 col-xl-3">
 			<div class="card mb-3">
 				<div class="card-body">
 					Deadline
@@ -65,7 +64,7 @@ var projectID = <?=$project->id?>;
 				</div>
 			</div>
 		</div>
-		<div class="col-md-6">
+		<div class="col-md-6 col-xl-3">
 			<div class="card mb-3">
 				<div class="card-body">
 					Age Range
@@ -73,7 +72,7 @@ var projectID = <?=$project->id?>;
 				</div>
 			</div>
 		</div>
-		<div class="col-md-6">
+		<div class="col-md-6 col-xl-3">
 			<div class="card mb-3">
 				<div class="card-body">
 					Tests Created
@@ -81,7 +80,7 @@ var projectID = <?=$project->id?>;
 				</div>
 			</div>
 		</div>
-		<div class="col-md-6">
+		<div class="col-md-6 col-xl-3">
 			<div class="card mb-3">
 				<div class="card-body">
 					Completed Tests
@@ -99,14 +98,14 @@ var projectID = <?=$project->id?>;
 		</div>
 		<div class="card-body">
 			<div class="row">
-				<div class="col-3"><img height="24" src="/img/markers/building-red.png" alt="" /> Test (Unassigned)</div>
-				<div class="col-3"><img height="24" src="/img/markers/building-orange.png" alt="" /> Test (Assigned)</div>
-				<div class="col-3"><img height="24" src="/img/markers/building-blue.png" alt="" /> Test (Pending Verification)</div>
-				<div class="col-3"><img height="24" src="/img/markers/building-green.png" alt="" /> Test (Completed)</div>
+				<div class="col-3"><img height="24" src="/img/markers/building-red.png" alt="" /> Unassigned <span class="badge badge-primary badge-pill" id="unassigned-count"></span></div>
+				<div class="col-3"><img height="24" src="/img/markers/building-orange.png" alt="" /> Assigned-Started <span class="badge badge-primary badge-pill" id="assigned-count"></span></div>
+				<div class="col-3"><img height="24" src="/img/markers/building-blue.png" alt="" /> Pending Verification <span class="badge badge-primary badge-pill" id="pending-verification-count"></span></div>
+				<div class="col-3"><img height="24" src="/img/markers/building-green.png" alt="" /> Completed <span class="badge badge-primary badge-pill" id="completed-count"></span></div>
 			</div>
 			<div class="row">
-				<div class="col-3"><img height="24" src="/img/markers/user-red.png" alt="" /> Tester (Out of Range)</div>
-				<div class="col-3"><img height="24" src="/img/markers/user-green.png" alt="" /> Tester (In Range)</div>
+				<div class="col-3"><img height="24" src="/img/markers/user-red.png" alt="" /> Out-of-Range Tester</div>
+				<div class="col-3"><img height="24" src="/img/markers/user-green.png" alt="" /> In-Range Tester</div>
 			</div>
 		</div>
 	</div>