Explorar el Código

Add "Test Date" column to admin tests list

Alan Lam hace 4 años
padre
commit
1e21c30eb9
Se han modificado 5 ficheros con 38 adiciones y 12 borrados
  1. 1 1
      controllers/account.php
  2. 6 2
      controllers/tests_admin_list.php
  3. 8 4
      engine/test.php
  4. 6 0
      engine/util.php
  5. 17 5
      views/test_list.php

+ 1 - 1
controllers/account.php

@@ -223,7 +223,7 @@ if($users_pending_verification) {
 }
 
 if($tests_pending_verification) {
-	$icon = new AccountIcon(__("Verify Tests"), "/account/tests?status=" . Test::STATUS_PENDING_VERIFICATION, "clipboard-check");
+	$icon = new AccountIcon(__("Verify Tests"), "/account/tests?status=" . Test::STATUS_PENDING_VERIFICATION . "&sort=end", "clipboard-check");
 	$icon->setCounter($tests_pending_verification);
 	$to_do[] = $icon;
 }

+ 6 - 2
controllers/tests_admin_list.php

@@ -145,6 +145,9 @@ switch($sort) {
 	case "due":
 		$query_options = ["sort" => "dts_due", "order" => "asc"];
 		break;
+	case "end":
+		$query_options = ["sort" => "dts_end", "order" => "desc"];
+		break;
 	default:
 		$sort = "status";
 		$query_options = ["sort" => "status", "order" => "asc"];
@@ -235,8 +238,9 @@ usort($projects, static function(Project $a, Project $b): int {
 
 $sorts = [
 	"status" => "Status",
-	"updated" => "Update",
-	"due" => "Due",
+	"updated" => "Recently updated",
+	"end" => "Test date",
+	"due" => "Test due date",
 ];
 
 Core::addScript("public/js/app-test-list.js");

+ 8 - 4
engine/test.php

@@ -850,11 +850,15 @@ class Test extends Model {
 	}
 
 	public function getDateTimeDue(): ?CarbonImmutable {
-		if(!$this->dts_due) {
-			return null;
-		}
+		return Util::getDateTimeFromUtcString($this->dts_due);
+	}
+
+	public function getDateTimeStart(): ?CarbonImmutable {
+		return Util::getDateTimeFromUtcString($this->dts_start);
+	}
 
-		return CarbonImmutable::parse($this->dts_due, "UTC");
+	public function getDateTimeEnd(): ?CarbonImmutable {
+		return Util::getDateTimeFromUtcString($this->dts_end);
 	}
 
 }

+ 6 - 0
engine/util.php

@@ -1,5 +1,7 @@
 <?php
 
+use Carbon\CarbonImmutable;
+
 class Util {
 
 	/**
@@ -384,4 +386,8 @@ class Util {
 		return $output;
 	}
 
+	public static function getDateTimeFromUtcString(?string $dts): ?CarbonImmutable {
+		return $dts ? CarbonImmutable::parse($dts, "UTC") : null;
+	}
+
 }

+ 17 - 5
views/test_list.php

@@ -93,7 +93,7 @@ foreach($projects as $project) {
 				<a class="btn btn-block btn-warning" href="/account/tests?status=<?=Test::STATUS_CONFIRMED?>">Confirmed</a>
 			</div>
 			<div class="col mb-1">
-				<a class="btn btn-block btn-success" href="/account/tests?status=<?=Test::STATUS_PENDING_VERIFICATION?>">Pending Verification</a>
+				<a class="btn btn-block btn-success" href="/account/tests?status=<?=Test::STATUS_PENDING_VERIFICATION?>&amp;sort=end">Pending Verification</a>
 			</div>
 			<div class="col mb-1">
 				<a class="btn btn-block btn-danger" href="/account/tests?pass=0">Fails</a>
@@ -282,6 +282,7 @@ foreach($projects as $project) {
 							<th>Project</th>
 							<th>Tester</th>
 							<th>Due Date</th>
+							<th>Test Date</th>
 							<th>Status</th>
 							<th>Result</th>
 							<th></th>
@@ -295,12 +296,11 @@ foreach($projects as $project) {
 							$project = $test->getProject();
 							$tester = $test->getTester();
 
-							$unix_start = strtotime($test->dts_start . " UTC");
-							$unix_end = strtotime($test->dts_end . " UTC");
-
 							$dt_due = $test->getDateTimeDue();
 							$is_overdue = $test->isOverdue();
 							$due_class = $is_overdue ? "text-danger" : "";
+
+							$dt_end = $test->getDateTimeEnd();
 							?>
 
 							<tr>
@@ -357,7 +357,7 @@ foreach($projects as $project) {
 									if($dt_due) {
 										$days_overdue = $dt_due->diffInDays();
 										?>
-										<strong><?=$dt_due->format("Y-m-d")?></strong>
+										<strong><?=$dt_due->format("d/m/Y")?></strong>
 										<?php
 										if($is_overdue) {
 											?><br />
@@ -374,6 +374,18 @@ foreach($projects as $project) {
 									}
 									?>
 								</td>
+								<td>
+									<?php
+									if($dt_end) {
+										$dt_end = $dt_end->setTimezone(TIMEZONE);
+										?>
+										<strong>
+											<?=$dt_end->format("d/m/Y")?>
+										</strong>
+										<?php
+									}
+									?>
+								</td>
 								<td class="text-center align-middle">
 									<span class="badge badge-<?=$test->getStatusClass()?>"><?=$test->getStatusText()?></span>
 								</td>