Alan Lam 2 лет назад
Родитель
Сommit
29ef29aa6b
2 измененных файлов с 4 добавлено и 6 удалено
  1. 2 2
      controllers/project.php
  2. 2 4
      engine/test.php

+ 2 - 2
controllers/project.php

@@ -33,8 +33,8 @@ $pending_verification_test_count = count($pending_verification_tests);
 $completed_tests = array_filter($tests, function($test) { return $test->status == Test::STATUS_COMPLETED; });
 $completed_tests = array_filter($tests, function($test) { return $test->status == Test::STATUS_COMPLETED; });
 $completed_test_count = count($completed_tests);
 $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_count = count(array_filter($tests, function($test) { return $test->isPass(); }));
+$fail_count = count(array_filter($tests, function($test) { return $test->isFail(); }));
 $pass_fail_count = $pass_count + $fail_count;
 $pass_fail_count = $pass_count + $fail_count;
 
 
 $pass_percentage = 0;
 $pass_percentage = 0;

+ 2 - 4
engine/test.php

@@ -655,8 +655,7 @@ class Test extends Model {
 	 * @return bool
 	 * @return bool
 	 */
 	 */
 	public function isPass(): bool {
 	public function isPass(): bool {
-		if($this->isPending()) return false;
-		return !empty($this->pass);
+		return (int) $this->pass === 1;
 	}
 	}
 
 
 	/**
 	/**
@@ -670,8 +669,7 @@ class Test extends Model {
 	 * @return bool
 	 * @return bool
 	 */
 	 */
 	public function isFail(): bool {
 	public function isFail(): bool {
-		if($this->isPending()) return false;
-		return empty($this->pass);
+		return (int) $this->pass === 0;
 	}
 	}
 
 
 	/**
 	/**