Переглянути джерело

Added test result column.

Alan Lam 8 роки тому
батько
коміт
5d141c6fec
2 змінених файлів з 13 додано та 2 видалено
  1. 5 0
      engine/test.php
  2. 8 2
      views/test_list.php

+ 5 - 0
engine/test.php

@@ -100,6 +100,11 @@ class Test extends Model {
 		return $this->pass ? "success" : "danger";
 		return $this->pass ? "success" : "danger";
 	}
 	}
 
 
+	public function getPassIcon() {
+		if(is_null($this->pass)) return "clock";
+		return $this->pass ? "check-circle" : "times-circle";
+	}
+
 	public function getPassText() {
 	public function getPassText() {
 		if(is_null($this->pass)) return "Pending";
 		if(is_null($this->pass)) return "Pending";
 		return $this->pass ? "Pass" : "Fail";
 		return $this->pass ? "Pass" : "Fail";

+ 8 - 2
views/test_list.php

@@ -93,7 +93,7 @@ $filters_collapse = $filter_count ? "collapse show" : "collapse";
 
 
 		<div class="table-responsive">
 		<div class="table-responsive">
 
 
-			<table class="table table-hover">
+			<table class="table table-sm table-hover" style="min-width: 1024px;">
 				<thead>
 				<thead>
 					<th>ID</th>
 					<th>ID</th>
 					<th>Location</th>
 					<th>Location</th>
@@ -101,6 +101,7 @@ $filters_collapse = $filter_count ? "collapse show" : "collapse";
 					<th>Tester</th>
 					<th>Tester</th>
 					<th>Due Date</th>
 					<th>Due Date</th>
 					<th>Status</th>
 					<th>Status</th>
+					<th>Result</th>
 					<th></th>
 					<th></th>
 				</thead>
 				</thead>
 				<tbody>
 				<tbody>
@@ -156,7 +157,12 @@ $filters_collapse = $filter_count ? "collapse show" : "collapse";
 						?>
 						?>
 						</td>
 						</td>
 						<td class="text-center align-middle">
 						<td class="text-center align-middle">
-							<span class="badge badge-lg badge-<?=$test->getStatusClass()?>"><?=$test->getStatusText()?></span>
+							<span class="badge badge-<?=$test->getStatusClass()?>"><?=$test->getStatusText()?></span>
+						</td>
+						<td class="text-center align-middle text-<?=$test->getPassClass()?>">
+							<div data-toggle="tooltip" title="<?=$test->getPassText()?>">
+								<i class="fas fa-2x fa-fw fa-<?=$test->getPassIcon()?>"></i>
+							</div>
 						</td>
 						</td>
 						<td class="text-right align-middle">
 						<td class="text-right align-middle">
 							<a class="btn btn-outline-primary" href="/account/tests/<?=$test->id?>">View</a>
 							<a class="btn btn-outline-primary" href="/account/tests/<?=$test->id?>">View</a>