Просмотр исходного кода

Added controller for accepting/declining tests.

Alan Lam 8 лет назад
Родитель
Сommit
496600865e
3 измененных файлов с 51 добавлено и 4 удалено
  1. 4 2
      controllers/test.php
  2. 39 0
      controllers/test_confirm.php
  3. 8 2
      routes.php

+ 4 - 2
controllers/test.php

@@ -24,6 +24,7 @@ if(Core::$user->level == User::LEVEL_TESTER) {
 	Core::$show_footer_content = false;
 
 	if(Core::$user->id != $test->tester_id) throw new Exception("You do not have permission to view this page.");
+	if($test->status == Test::STATUS_ASSIGNED) throw new Exception("You do not have permission to view this page as you have not accepted the test yet.");
 
 	// Show completed message
 	if($test->status >= Test::STATUS_PENDING_VERIFICATION) {
@@ -47,7 +48,7 @@ if(Core::$user->level == User::LEVEL_TESTER) {
 
 			$form_exception = new FormException;
 
-			if($test->status == Test::STATUS_ASSIGNED) {
+			if($test->status == Test::STATUS_CONFIRMED) {
 				// Parse before the test form
 				$fields = $json->beforeTest;
 
@@ -115,6 +116,7 @@ if(Core::$user->level == User::LEVEL_TESTER) {
 					else {
 						$test_value = TestValue::get($test->id, $name);
 						if(!$test_value) {
+							$test_value = new TestValue;
 							$test_value->test_id = $test->id;
 							$test_value->name = $name;
 						}
@@ -129,7 +131,7 @@ if(Core::$user->level == User::LEVEL_TESTER) {
 			if($form_exception->hasErrors()) throw $form_exception;
 
 			// Before the Test
-			if($test->status == Test::STATUS_ASSIGNED) {
+			if($test->status == Test::STATUS_CONFIRMED) {
 				$test->status = Test::STATUS_STARTED;
 				$test->dts_start = Util::getDateTime();
 				$success = $test->commit();

+ 39 - 0
controllers/test_confirm.php

@@ -0,0 +1,39 @@
+<?php
+
+$test = Test::get($id);
+if(!$test) throw new Exception("Test not found.");
+if($test->tester_id != Core::$user->id) throw new Exception("You do not have permission to view this page.");
+if($test->status > Test::STATUS_ASSIGNED) throw new Exception("The test has already been accepted or declined.");
+
+switch($action) {
+	case "accept":
+
+		$test->status = Test::STATUS_CONFIRMED;
+		$test->commit();
+
+		// TODO: Email/notification?
+
+		Core::addAlert("Test accepted successfully.");
+		HTTP::redirect("/account/tests");
+
+		break;
+
+	case "decline":
+
+		$test->tester_id = null;
+		$test->dts_due = null;
+		$test->dts_assigned = null;
+		$test->commit();
+
+		// TODO: Email/notification?
+
+		Core::addAlert("Test declined successfully.");
+		HTTP::redirect("/account/tests");
+
+		break;
+	default:
+		throw new Exception("Invalid action.");
+}
+
+
+?>

+ 8 - 2
routes.php

@@ -37,27 +37,32 @@ $routes = [
 	"/^account$/" => ["controller" => "account", "require_log_in" => true],
 	"/^account\/settings$/" => ["controller" => "settings", "require_log_in" => true],
 
+	// Addresses
 	"/^account\/addresses$/" => ["controller" => "addresses", "require_log_in" => true],
 	"/^account\/addresses\/add$/" => ["controller" => "address_add", "require_log_in" => true],
 	"/^account\/addresses\/edit\/$id_pattern$/" => ["controller" => "address_edit", "params" => ["id"], "require_log_in" => true],
 
+	// Projects
 	"/^account\/projects$/" => ["controller" => "projects", "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^account\/projects\/add$/" => ["controller" => "project_add", "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern$/" => ["controller" => "project", "params" => ["id"], "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^account\/projects\/$id_pattern\/edit$/" => ["controller" => "project_edit", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
-
 	"/^account\/projects\/$id_pattern\/(get-locations|get-testers|create-test|assign-tester)$/" => ["controller" => "project_ajax", "params" => ["id", "action"], "type" => "json", "require_user_level" => User::LEVEL_ADMIN],
 
+	// Tests
 	"/^account\/tests$/" => ["controller" => "tests", "require_user_level" => User::LEVEL_TESTER],
-
 	"/^account\/tests\/$id_pattern$/" => ["controller" => "test", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER],
 	"/^account\/tests\/$id_pattern\/files\/([a-z_]+)$/" => ["controller" => "test_file", "params" => ["id", "name"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/tests\/$id_pattern\/result$/" => ["controller" => "test_result", "params" => ["id"], "require_user_level" => User::LEVEL_VENUE],
+	"/^account\/tests\/$id_pattern\/pdf$/" => ["controller" => "test_pdf", "params" => ["id"], "require_user_level" => User::LEVEL_VENUE],
+	"/^account\/tests\/$id_pattern\/(accept|decline)$/" => ["controller" => "test_confirm", "params" => ["id", "action"], "require_user_level" => User::LEVEL_TESTER],
 
+	// Templates
 	"/^account\/templates$/" => ["controller" => "templates", "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^account\/templates\/add$/" => ["controller" => "template_add", "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/templates\/$id_pattern$/" => ["controller" => "template", "params" => ["id"], "require_user_level" => User::LEVEL_CUSTOMER],
 
+	// Users
 	"/^account\/users$/" => ["controller" => "users", "require_admin" => true],
 	"/^account\/users\/$id_pattern$/" => ["controller" => "user", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/users\/$id_pattern\/edit$/" => ["controller" => "user_edit", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
@@ -65,6 +70,7 @@ $routes = [
 	"/^account\/users\/$id_pattern\/verify\/(id-document|photo)$/" => ["controller" => "user_verify_image", "params" => ["id", "type"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/users\/$id_pattern\/(id-document|photo)$/" => ["controller" => "user_verify_image", "params" => ["id", "type"], "require_user_level" => User::LEVEL_ADMIN],
 
+	// Locations
 	"/^account\/locations$/" => ["controller" => "locations", "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^account\/locations\/add$/" => ["controller" => "location_add", "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^account\/locations\/$id_pattern$/" => ["controller" => "location_view", "params" => ["id"], "require_user_level" => User::LEVEL_CUSTOMER],