Browse Source

Added pass/fail ratio stat.

Alan Lam 8 năm trước cách đây
mục cha
commit
1659bb71bc
2 tập tin đã thay đổi với 37 bổ sung và 11 xóa
  1. 12 1
      controllers/project.php
  2. 25 10
      views/project.php

+ 12 - 1
controllers/project.php

@@ -32,6 +32,17 @@ $pending_verification_test_count = count($pending_verification_tests);
 $completed_tests = array_filter($tests, function($test) { return $test->status == Test::STATUS_COMPLETED; });
 $completed_test_count = count($completed_tests);
 
+$pass_count = count(array_filter($tests, function($test) { return $test->pass === "1"; }));
+$fail_count = count(array_filter($tests, function($test) { return $test->pass === "0"; }));
+$pass_fail_count = $pass_count + $fail_count;
+
+$pass_percentage = 0;
+$fail_percentage = 0;
+if($pass_fail_count) {
+	$pass_percentage = number_format(($pass_count / $fail_count) * 100, 1);
+	$fail_percentage = 100 - $pass_percentage;
+}
+
 $min_lat = $min_lng = 180;
 $max_lat = $max_lng = -180;
 
@@ -51,7 +62,7 @@ $longitude = -1.1743197;
 $deadline_date = explode(" ", $project->dts_deadline)[0];
 
 View::includeOnce("header", compact("page_title"));
-View::include("project", compact("project", "tests", "latitude", "longitude", "completed_percentage", "customer", "locations", "deadline_date", "created_test_count", "completed_test_count"));
+View::include("project", compact("project", "tests", "latitude", "longitude", "completed_percentage", "pass_count", "fail_count", "pass_fail_count", "pass_percentage", "fail_percentage", "customer", "locations", "deadline_date", "created_test_count", "completed_test_count"));
 View::include("modal_assign_tester");
 View::includeOnce("footer");
 

+ 25 - 10
views/project.php

@@ -28,19 +28,34 @@ var projectID = <?=$project->id?>;
 		</div>
 	</div>
 
-	<div class="card mb-3">
-		<div class="card-body">
-			Progress
-			<div class="stat mb-3">
-				<?=htmlspecialchars($completed_percentage)?>% Complete
+	<div class="row">
+		<div class="col-md-6">
+			<div class="card mb-3">
+				<div class="card-body">
+					Progress
+					<div class="stat mb-3">
+						<?=htmlspecialchars($completed_percentage)?>% Complete
+					</div>
+					<div class="progress">
+						<div class="progress-bar" role="progressbar" style="width: <?=$completed_percentage?>%"></div>
+					</div>
+				</div>
 			</div>
-			<div class="progress">
-				<div class="progress-bar" role="progressbar" style="width: <?=$completed_percentage?>%"></div>
+		</div>
+		<div class="col-md-6">
+			<div class="card mb-3">
+				<div class="card-body">
+					Pass/Fail Ratio
+					<div class="stat mb-3">
+						<?=number_format($pass_count)?> Pass / <?=number_format($fail_count)?> Fail
+					</div>
+					<div class="progress">
+						<div class="progress-bar bg-success" role="progressbar" style="width: <?=$pass_percentage?>%"></div>
+						<div class="progress-bar bg-danger" role="progressbar" style="width: <?=$fail_percentage?>%"></div>
+					</div>
+				</div>
 			</div>
 		</div>
-	</div>
-
-	<div class="row">
 		<div class="col-md-6">
 
 			<div class="card mb-3">