|
|
@@ -265,6 +265,14 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
|
|
|
|
|
|
$test->verifier_notes = http::value("verifier_notes", "trim");
|
|
|
|
|
|
+ // Check selected retest project
|
|
|
+ $retest_project = false;
|
|
|
+ $retest_project_id = http::value("retest_project_id", "int");
|
|
|
+ if($retest_project_id) {
|
|
|
+ $retest_project = Project::get($retest_project_id);
|
|
|
+ if(!$retest_project || $retest_project->customer_id != $customer->id) throw new Exception("The retest project selected is invalid.");
|
|
|
+ }
|
|
|
+
|
|
|
// Modify test values
|
|
|
|
|
|
// Overrides
|
|
|
@@ -354,6 +362,16 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
|
|
|
$tester->score++;
|
|
|
$tester->commit();
|
|
|
|
|
|
+ if(!$test->pass && $retest_project) {
|
|
|
+ $retest = new Test;
|
|
|
+ $retest->project_id = $retest_project->id;
|
|
|
+ $retest->location_id = $location->id;
|
|
|
+ $retest->status = Test::STATUS_UNASSIGNED;
|
|
|
+ $retest->dts_created = Util::getDateTime();
|
|
|
+ $retest->retest = 1;
|
|
|
+ $success = $retest->commit();
|
|
|
+ }
|
|
|
+
|
|
|
// Save PDF
|
|
|
$pdf = $test->getPDF();
|
|
|
$pdf_string = $pdf->Output("S");
|
|
|
@@ -398,8 +416,15 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ $projects = $customer->getProjects();
|
|
|
+ $future_projects = array_filter($projects, function($p) use ($project) {
|
|
|
+ if($p->id == $project->id) return false;
|
|
|
+ $unix_deadline = Util::getUnixTimeFromUTC($p->dts_deadline);
|
|
|
+ return ($unix_deadline > time());
|
|
|
+ });
|
|
|
+
|
|
|
View::includeOnce("header", compact("page_title"));
|
|
|
- View::include("test_verify_form", compact("test", "has_pdf", "tester", "location", "project", "customer", "template", "fields", "values", "tester_message"));
|
|
|
+ View::include("test_verify_form", compact("test", "has_pdf", "tester", "location", "project", "future_projects", "customer", "template", "fields", "values", "tester_message"));
|
|
|
View::includeOnce("footer");
|
|
|
return;
|
|
|
}
|