Ver Fonte

Add tester manager access permissions

Alan Lam há 6 anos atrás
pai
commit
e280d32833

+ 40 - 14
controllers/account.php

@@ -74,40 +74,62 @@ $tests_remaining = 0;
 
 
 $icons = [];
 $icons = [];
 
 
-if($user->level >= User::LEVEL_ADMIN) {
-
+if($user->canAccessCustomers()) {
 	$icons[] = new AccountIcon(__("Customers"), "/account/customers", "warehouse");
 	$icons[] = new AccountIcon(__("Customers"), "/account/customers", "warehouse");
+}
+
+if($user->canAccessMapOverview()) {
 	$icons[] = new AccountIcon(__("Map Overview"), "/account/map-overview", "map-marked");
 	$icons[] = new AccountIcon(__("Map Overview"), "/account/map-overview", "map-marked");
-	$icons[] = new AccountIcon(($user->level == User::LEVEL_SUPERADMIN ? __("Users") : __("Testers")), "/account/users", "users");
+}
 
 
+if($user->canAccessUsers()) {
 	$users = User::query(["level" => User::LEVEL_UNVERIFIED]);
 	$users = User::query(["level" => User::LEVEL_UNVERIFIED]);
 	$tests = Test::query(["status" => Test::STATUS_PENDING_VERIFICATION]);
 	$tests = Test::query(["status" => Test::STATUS_PENDING_VERIFICATION]);
 
 
 	$users_pending_verification = count($users);
 	$users_pending_verification = count($users);
 	$tests_pending_verification = count($tests);
 	$tests_pending_verification = count($tests);
 
 
+	$icons[] = new AccountIcon(($user->isSuperAdmin() ? __("Users") : __("Testers")), "/account/users", "users");
+}
+
+if($user->canAccessProjects()) {
 	$icons[] = new AccountIcon(__("Projects"), "/account/projects", "list");
 	$icons[] = new AccountIcon(__("Projects"), "/account/projects", "list");
+}
+
+if($user->canAccessTemplates()) {
 	$icons[] = new AccountIcon(__("Templates"), "/account/templates", "file-alt");
 	$icons[] = new AccountIcon(__("Templates"), "/account/templates", "file-alt");
+}
+
+if($user->canAccessVenueTypes()) {
 	$icons[] = new AccountIcon(__("Venue Types"), "/account/venue-types", "list-alt");
 	$icons[] = new AccountIcon(__("Venue Types"), "/account/venue-types", "list-alt");
+}
+
+if($user->canAccessLog()) {
+	$icons[] = new AccountIcon(__("Log"), "/account/log", "database");
+}
 
 
+if($user->canAccessInvoices()) {
 	$pending_tester_invoice_test_count = count(Test::query(["status_tester_invoice" => Test::STATUS_TESTER_INVOICE_PENDING]));
 	$pending_tester_invoice_test_count = count(Test::query(["status_tester_invoice" => Test::STATUS_TESTER_INVOICE_PENDING]));
 
 
 	$invoice_icon = new AccountIcon(__("Invoices"), "/account/tests?status_tester_invoice=100", "file-invoice");
 	$invoice_icon = new AccountIcon(__("Invoices"), "/account/tests?status_tester_invoice=100", "file-invoice");
 	$invoice_icon->setCounter($pending_tester_invoice_test_count);
 	$invoice_icon->setCounter($pending_tester_invoice_test_count);
 
 
-	$icons[] = new AccountIcon(__("Log"), "/account/log", "database");
-
 	$icons[] = $invoice_icon;
 	$icons[] = $invoice_icon;
-
 }
 }
 
 
-if($user->level >= User::LEVEL_CUSTOMER) {
+if($user->canAccessLocations()) {
 	$icons[] = new AccountIcon(__("Locations"), "/account/locations", "map-marker");
 	$icons[] = new AccountIcon(__("Locations"), "/account/locations", "map-marker");
+}
+
+if($user->canAccessReports()) {
 	$icons[] = new AccountIcon(__("Reports"), "/account/reports", "chart-pie");
 	$icons[] = new AccountIcon(__("Reports"), "/account/reports", "chart-pie");
+}
+
+if($user->canAccessTestResults()) {
 	$icons[] = new AccountIcon(__("Test Results"), "/account/test-results", "clipboard-list-check");
 	$icons[] = new AccountIcon(__("Test Results"), "/account/test-results", "clipboard-list-check");
 }
 }
 
 
-if($user->isTester() || $user->isAdmin()) {
+if($user->canAccessTests()) {
 	$tests = $user->getPendingTests();
 	$tests = $user->getPendingTests();
 	$tests_remaining = count($tests);
 	$tests_remaining = count($tests);
 
 
@@ -118,17 +140,19 @@ if($user->isTester() || $user->isAdmin()) {
 	$icons[] = $tests_icon;
 	$icons[] = $tests_icon;
 }
 }
 
 
-if($user->isTester() || $user->isAdmin() || $user->isUnverified() || $user->isRegistered()) {
+if($user->canAccessPractice()) {
 	$icons[] = new AccountIcon(__("Practice"), "/account/practice", "chalkboard-teacher");
 	$icons[] = new AccountIcon(__("Practice"), "/account/practice", "chalkboard-teacher");
 }
 }
 
 
-if($user->level == User::LEVEL_TESTER) {
+if($user->canAccessAddresses()) {
 	$icons[] = new AccountIcon(__("Addresses"), "/account/addresses", "address-book");
 	$icons[] = new AccountIcon(__("Addresses"), "/account/addresses", "address-book");
-	$icons[] = new AccountIcon(__("Tests (Completed)"), "/account/tests/completed", "check");
 }
 }
 
 
-if($user->level == User::LEVEL_REGISTERED) {
+if($user->canAccessCompletedTests()) {
+	$icons[] = new AccountIcon(__("Tests (Completed)"), "/account/tests/completed", "check");
+}
 
 
+if($user->canSubmitId()) {
 	$submit_id_icon = new AccountIcon(__("Submit ID"), "/account/submit-id", "id-card");
 	$submit_id_icon = new AccountIcon(__("Submit ID"), "/account/submit-id", "id-card");
 	$submit_id_icon->setButtonClass("btn-warning");
 	$submit_id_icon->setButtonClass("btn-warning");
 
 
@@ -147,10 +171,12 @@ usort($icons, function($a, $b) {
 
 
 // Actions
 // Actions
 $actions = [];
 $actions = [];
-if($user->level == User::LEVEL_DEACTIVATED) {
+
+if($user->canReactivate()) {
 	$actions[] = new AccountIcon(__("Reactivate Account"), "/account/reactivate", "user-check");
 	$actions[] = new AccountIcon(__("Reactivate Account"), "/account/reactivate", "user-check");
 }
 }
-else if($user->level == User::LEVEL_TESTER) {
+
+if($user->canDeactivate()) {
 	$actions[] = new AccountIcon(__("Deactivate Account..."), "/account/deactivate", "user-times");
 	$actions[] = new AccountIcon(__("Deactivate Account..."), "/account/deactivate", "user-times");
 }
 }
 
 

+ 0 - 2
controllers/customers.php

@@ -10,5 +10,3 @@ $customers = Customer::query([], ["sort" => "name"]);
 View::includeOnce("header", compact("page_title"));
 View::includeOnce("header", compact("page_title"));
 View::include("customers", compact("customers"));
 View::include("customers", compact("customers"));
 View::includeOnce("footer");
 View::includeOnce("footer");
-
-?>

+ 1 - 3
controllers/practice_file.php

@@ -8,7 +8,7 @@ $test = $tests[$id] ?? false;
 if(!$test) throw new Exception(__("Practice test not found."));
 if(!$test) throw new Exception(__("Practice test not found."));
 
 
 
 
-if(Core::$user->level < User::LEVEL_ADMIN) {
+if(!Core::$user->canAccessPractice()) {
 	if(Core::$user->id != $test->tester_id) throw new Exception(__("You do not have permission to access this resource."));
 	if(Core::$user->id != $test->tester_id) throw new Exception(__("You do not have permission to access this resource."));
 }
 }
 
 
@@ -23,5 +23,3 @@ else {
 	header("Content-Type: image/png");
 	header("Content-Type: image/png");
 	readfile("public/img/blank.png");
 	readfile("public/img/blank.png");
 }
 }
-
-?>

+ 1 - 1
controllers/project_ajax.php

@@ -123,7 +123,7 @@ if($submit) {
 
 
 				$max_distance = 25;
 				$max_distance = 25;
 
 
-				if(Core::$user->level >= User::LEVEL_ADMIN) {
+				if(Core::$user->canAccessProjects()) {
 					$max_distance = 1000;
 					$max_distance = 1000;
 				}
 				}
 
 

+ 4 - 1
controllers/project_export.php

@@ -1,4 +1,6 @@
-<?php
+<?php /** @noinspection PhpUnhandledExceptionInspection */
+
+$user = Core::$user;
 
 
 if(!isset($id, $type)) {
 if(!isset($id, $type)) {
 	$ids = http::value("ids", "int");
 	$ids = http::value("ids", "int");
@@ -37,6 +39,7 @@ $tests = Test::query([
 switch($type) {
 switch($type) {
 
 
 	case "admin":
 	case "admin":
+		if(!$user->canExportProjectCsv()) throw new Exception("You do not have permission to perform this action.");
 		$template->exportTestsCSV("project_csv.php", $tests);
 		$template->exportTestsCSV("project_csv.php", $tests);
 		break;
 		break;
 
 

+ 3 - 3
controllers/test.php

@@ -32,7 +32,7 @@ Core::addBreadcrumb("/account/tests", "Tests");
 Core::addBreadcrumb("/account/tests/$id", $page_title);
 Core::addBreadcrumb("/account/tests/$id", $page_title);
 
 
 // Do test
 // Do test
-if(Core::$user->level == User::LEVEL_TESTER) {
+if(Core::$user->isTester()) {
 
 
 	Core::$show_footer_content = false;
 	Core::$show_footer_content = false;
 
 
@@ -238,7 +238,7 @@ if(Core::$user->level == User::LEVEL_TESTER) {
 }
 }
 
 
 // Verify test
 // Verify test
-else if(Core::$user->level >= User::LEVEL_ADMIN) {
+else if(Core::$user->canVerifyTests()) {
 
 
 	$json = json_decode($template->getJSON());
 	$json = json_decode($template->getJSON());
 	$fields = array_merge($json->beforeTest, [(object) ["type" => "hr"]], $json->duringTest);
 	$fields = array_merge($json->beforeTest, [(object) ["type" => "hr"]], $json->duringTest);
@@ -473,7 +473,7 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
 }
 }
 
 
 // View test results
 // View test results
-else if(Core::$user->level >= User::LEVEL_VENUE) {
+else if(Core::$user->canAccessTestResult()) {
 	HTTP::redirect("/account/tests/$id/result");
 	HTTP::redirect("/account/tests/$id/result");
 }
 }
 else {
 else {

+ 1 - 1
controllers/test_file.php

@@ -15,7 +15,7 @@ if($is_pdf) {
 }
 }
 
 
 if(!$is_pdf) {
 if(!$is_pdf) {
-	if(Core::$user->level < User::LEVEL_ADMIN) {
+	if(!Core::$user->canVerifyTests()) {
 		if(Core::$user->id != $test->tester_id) throw new Exception(__("You do not have permission to access this resource."));
 		if(Core::$user->id != $test->tester_id) throw new Exception(__("You do not have permission to access this resource."));
 	}
 	}
 }
 }

+ 3 - 5
controllers/tests.php

@@ -8,21 +8,19 @@ Core::addBreadcrumb("/account/tests", $page_title);
 $user = Core::$user;
 $user = Core::$user;
 
 
 // Admin / Super Admin
 // Admin / Super Admin
-if($user->level >= User::LEVEL_ADMIN) {
+if($user->canAccessAdminTestsList()) {
 	require "tests_admin_list.php";
 	require "tests_admin_list.php";
 }
 }
 
 
 // HQ / Venue (view completed tests)
 // HQ / Venue (view completed tests)
-else if($user->level >= User::LEVEL_VENUE) {
+else if($user->canAccessTestResults()) {
 	require "tests_location_list.php";
 	require "tests_location_list.php";
 }
 }
 
 
 // Tester
 // Tester
-else if($user->level == User::LEVEL_TESTER) {
+else if($user->isTester()) {
 	require "tests_tester_list.php";
 	require "tests_tester_list.php";
 }
 }
 
 
 View::includeOnce("modal_page_jump");
 View::includeOnce("modal_page_jump");
 View::includeOnce("footer");
 View::includeOnce("footer");
-
-?>

+ 6 - 3
engine/customer.php

@@ -39,7 +39,10 @@ class Customer extends Model {
 	 * @throws Exception
 	 * @throws Exception
 	 */
 	 */
 	public static function getForAdmin(): ?Customer {
 	public static function getForAdmin(): ?Customer {
-		$customers = Core::$user->getCustomers();
+
+		$user = Core::$user;
+
+		$customers = $user->getCustomers();
 		if(count($customers) == 0) throw new Exception("At least one customer must exist before this page can be accessed.");
 		if(count($customers) == 0) throw new Exception("At least one customer must exist before this page can be accessed.");
 		else if(count($customers) == 1) {
 		else if(count($customers) == 1) {
 			$customer = array_shift($customers);
 			$customer = array_shift($customers);
@@ -56,8 +59,8 @@ class Customer extends Model {
 
 
 			$customer = Customer::get($customer_id);
 			$customer = Customer::get($customer_id);
 
 
-			// Enforce restriction if CUSTOMER or lower
-			if(Core::$user->level < User::LEVEL_ADMIN) {
+			// Enforce restriction if user cannot access locations
+			if(!$user->canAccessLocations()) {
 				$link = UserCustomer::get(Core::$user->id, $customer_id);
 				$link = UserCustomer::get(Core::$user->id, $customer_id);
 				if(!$link) $customer = null;
 				if(!$link) $customer = null;
 			}
 			}

+ 106 - 10
engine/user.php

@@ -343,7 +343,7 @@ class User extends Model {
 	 * @return bool
 	 * @return bool
 	 */
 	 */
 	public function canAdmin() {
 	public function canAdmin() {
-		return $this->level >= User::LEVEL_ADMIN;
+		return $this->isAdmin();
 	}
 	}
 
 
 	/**
 	/**
@@ -382,23 +382,23 @@ class User extends Model {
 		}
 		}
 	}
 	}
 
 
-	public function isAdmin() {
-		return ($this->level == User::LEVEL_ADMIN || $this->level == User::LEVEL_SUPERADMIN);
+	public function isAdmin(): bool {
+		return $this->level >= User::LEVEL_ADMIN;
 	}
 	}
 
 
-	public function isCustomer() {
+	public function isCustomer(): bool {
 		return $this->level == User::LEVEL_CUSTOMER;
 		return $this->level == User::LEVEL_CUSTOMER;
 	}
 	}
 
 
-	public function isTester() {
+	public function isTester(): bool {
 		return $this->level == User::LEVEL_TESTER;
 		return $this->level == User::LEVEL_TESTER;
 	}
 	}
 
 
-	public function isDeactivated() {
+	public function isDeactivated(): bool {
 		return $this->level == User::LEVEL_DEACTIVATED;
 		return $this->level == User::LEVEL_DEACTIVATED;
 	}
 	}
 
 
-	public function getGenderText() {
+	public function getGenderText(): string {
 
 
 		if($this->gender == "M") return MALE;
 		if($this->gender == "M") return MALE;
 		if($this->gender == "F") return FEMALE;
 		if($this->gender == "F") return FEMALE;
@@ -434,7 +434,7 @@ class User extends Model {
 	 */
 	 */
 	public function hasPermission($object): bool {
 	public function hasPermission($object): bool {
 
 
-		if($this->isAdmin()) return true;
+		if($this->canAccessLocations()) return true;
 
 
 		$customers = $this->getCustomers();
 		$customers = $this->getCustomers();
 		$customer_ids = array_column($customers, "id");
 		$customer_ids = array_column($customers, "id");
@@ -583,11 +583,11 @@ class User extends Model {
 	 */
 	 */
 	public function getCustomers() {
 	public function getCustomers() {
 
 
-		if($this->level >= User::LEVEL_ADMIN) {
+		if($this->canAccessCustomers()) {
 			return Customer::query([], ["sort" => "name"]);
 			return Customer::query([], ["sort" => "name"]);
 		}
 		}
 
 
-		if($this->level == User::LEVEL_CUSTOMER) {
+		if($this->isCustomer()) {
 			$links = UserCustomer::query(["user_id" => $this->id]);
 			$links = UserCustomer::query(["user_id" => $this->id]);
 			return Customer::query([
 			return Customer::query([
 				"id" => array_column($links, "customer_id")
 				"id" => array_column($links, "customer_id")
@@ -657,4 +657,100 @@ class User extends Model {
 		return $this->level == User::LEVEL_REGISTERED;
 		return $this->level == User::LEVEL_REGISTERED;
 	}
 	}
 
 
+	public function isSuperAdmin(): bool {
+		return $this->level == User::LEVEL_SUPERADMIN;
+	}
+
+	public function canAccessCustomers(): bool {
+		return $this->level >= User::LEVEL_TESTER_MANAGER;
+	}
+
+	public function canAccessMapOverview(): bool {
+		return $this->level >= User::LEVEL_TESTER_MANAGER;
+	}
+
+	public function canAccessUsers(): bool {
+		return $this->level >= User::LEVEL_TESTER_MANAGER;
+	}
+
+	public function canAccessProjects(): bool {
+		return $this->level >= User::LEVEL_TESTER_MANAGER;
+	}
+
+	public function canAccessTemplates(): bool {
+		return $this->level >= User::LEVEL_ADMIN;
+	}
+
+	public function canAccessVenueTypes(): bool {
+		return $this->level >= User::LEVEL_ADMIN;
+	}
+
+	public function canAccessInvoices(): bool {
+		return $this->level >= User::LEVEL_ADMIN;
+	}
+
+	public function canAccessLog(): bool {
+		return $this->level >= User::LEVEL_ADMIN;
+	}
+
+	public function canAccessLocations(): bool {
+		return $this->level >= User::LEVEL_CUSTOMER;
+	}
+
+	public function canAccessReports(): bool {
+		return $this->level >= User::LEVEL_CUSTOMER;
+	}
+
+	public function canAccessTestResults(): bool {
+		return $this->level >= User::LEVEL_CUSTOMER;
+	}
+
+	public function canAccessTests(): bool {
+		return $this->isTester() || $this->isAdmin();
+	}
+
+	public function canAccessPractice(): bool {
+		return $this->isTester() || $this->isAdmin() || $this->isUnverified() || $this->isRegistered();
+	}
+
+	public function canAccessAddresses(): bool {
+		return $this->level == User::LEVEL_TESTER;
+	}
+
+	public function canAccessCompletedTests(): bool {
+		return $this->level == User::LEVEL_TESTER;
+	}
+
+	public function canSubmitId(): bool {
+		return $this->level == User::LEVEL_REGISTERED;
+	}
+
+	public function canDeactivate(): bool {
+		return $this->level == User::LEVEL_TESTER;
+	}
+
+	public function canReactivate(): bool {
+		return $this->level == User::LEVEL_DEACTIVATED;
+	}
+
+	public function canAccessAdminTestsList(): bool {
+		return $this->level >= User::LEVEL_TESTER_MANAGER;
+	}
+
+	public function canExportProjectCsv(): bool {
+		return $this->isAdmin();
+	}
+
+	public function canVerifyTests(): bool {
+		return $this->level >= User::LEVEL_TESTER_MANAGER;
+	}
+
+	public function canAccessTestResult(): bool {
+		return $this->level >= User::LEVEL_VENUE;
+	}
+
+	public function canEditUsers(): bool {
+		return $this->isAdmin();
+	}
+
 }
 }

+ 22 - 22
routes.php

@@ -55,24 +55,24 @@ $routes = [
 	"/^account\/addresses\/add$/" => ["controller" => "address_add", "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],
 	"/^account\/addresses\/edit\/$id_pattern$/" => ["controller" => "address_edit", "params" => ["id"], "require_log_in" => true],
 
 
-	"/^api\/addresses\/(get-all)$/" => ["controller" => "addresses_ajax", "params" => ["action"], "require_user_level" => User::LEVEL_ADMIN],
+	"/^api\/addresses\/(get-all)$/" => ["controller" => "addresses_ajax", "params" => ["action"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
 
 
 	// Map Overview
 	// Map Overview
-	"/^account\/map-overview$/" => ["controller" => "map_overview", "require_user_level" => User::LEVEL_ADMIN],
-	"/^account\/map-overview\/(get-customer-locations|get-project-locations)$/" => ["controller" => "map_overview_ajax", "params" => ["action"], "require_user_level" => User::LEVEL_ADMIN],
+	"/^account\/map-overview$/" => ["controller" => "map_overview", "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/map-overview\/(get-customer-locations|get-project-locations)$/" => ["controller" => "map_overview_ajax", "params" => ["action"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
 
 
 	// Projects
 	// Projects
 	"/^account\/projects$/" => ["controller" => "projects", "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^account\/projects$/" => ["controller" => "projects", "require_user_level" => User::LEVEL_CUSTOMER],
-	"/^account\/projects\/add$/" => ["controller" => "project_add", "require_user_level" => User::LEVEL_ADMIN],
+	"/^account\/projects\/add$/" => ["controller" => "project_add", "require_user_level" => User::LEVEL_TESTER_MANAGER],
 	"/^account\/projects\/$id_pattern$/" => ["controller" => "project", "params" => ["id"], "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^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\/edit\/template-overrides$/" => ["controller" => "project_edit_template_overrides", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
-	"/^account\/projects\/export-csv$/" => ["controller" => "project_export", "require_user_level" => User::LEVEL_ADMIN],
-	"/^account\/projects\/$id_pattern\/export-(admin|customer|quickbooks)-csv$/" => ["controller" => "project_export", "params" => ["id", "type"], "require_user_level" => User::LEVEL_ADMIN],
-	"/^account\/projects\/$id_pattern\/export-kml$/" => ["controller" => "project_kml", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
-	"/^account\/projects\/$id_pattern\/invoice$/" => ["controller" => "project_invoice", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
-	"/^account\/projects\/$id_pattern\/(mark-finished|mark-unfinished)$/" => ["controller" => "project_mark_finished", "params" => ["id", "action"], "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],
+	"/^account\/projects\/$id_pattern\/edit$/" => ["controller" => "project_edit", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/projects\/$id_pattern\/edit\/template-overrides$/" => ["controller" => "project_edit_template_overrides", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/projects\/export-csv$/" => ["controller" => "project_export", "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/projects\/$id_pattern\/export-(admin|customer|quickbooks)-csv$/" => ["controller" => "project_export", "params" => ["id", "type"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/projects\/$id_pattern\/export-kml$/" => ["controller" => "project_kml", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/projects\/$id_pattern\/invoice$/" => ["controller" => "project_invoice", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/projects\/$id_pattern\/(mark-finished|mark-unfinished)$/" => ["controller" => "project_mark_finished", "params" => ["id", "action"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^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_TESTER_MANAGER],
 
 
 	// Test Results
 	// Test Results
 	"/^account\/test-results$/" => ["controller" => "test_results_customer_list"],
 	"/^account\/test-results$/" => ["controller" => "test_results_customer_list"],
@@ -88,7 +88,7 @@ $routes = [
 	"/^account\/tests\/$id_pattern$/" => ["controller" => "test", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER],
 	"/^account\/tests\/$id_pattern$/" => ["controller" => "test", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER],
 	"/^account\/tests\/$id_pattern\/(selfie)$/" => ["controller" => "test_file", "params" => ["id", "name"], "require_user_level" => User::LEVEL_TESTER],
 	"/^account\/tests\/$id_pattern\/(selfie)$/" => ["controller" => "test_file", "params" => ["id", "name"], "require_user_level" => User::LEVEL_TESTER],
 	"/^account\/tests\/$id_pattern\/files\/(pdf)$/" => ["controller" => "test_file", "params" => ["id", "name"], "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^account\/tests\/$id_pattern\/files\/(pdf)$/" => ["controller" => "test_file", "params" => ["id", "name"], "require_user_level" => User::LEVEL_CUSTOMER],
-	"/^account\/tests\/$id_pattern\/files\/([a-z_]+)$/" => ["controller" => "test_file", "params" => ["id", "name"], "require_user_level" => User::LEVEL_ADMIN],
+	"/^account\/tests\/$id_pattern\/files\/([a-z_]+)$/" => ["controller" => "test_file", "params" => ["id", "name"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
 	"/^account\/tests\/$id_pattern\/result$/" => ["controller" => "test_result", "params" => ["id"], "require_user_level" => User::LEVEL_VENUE],
 	"/^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\/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],
 	"/^account\/tests\/$id_pattern\/(accept|decline)$/" => ["controller" => "test_confirm", "params" => ["id", "action"], "require_user_level" => User::LEVEL_TESTER],
@@ -106,15 +106,15 @@ $routes = [
 	"/^account\/venue-types\/$id_pattern\/(edit)$/" => ["controller" => "venue_type_form", "params" => ["id", "action"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/venue-types\/$id_pattern\/(edit)$/" => ["controller" => "venue_type_form", "params" => ["id", "action"], "require_user_level" => User::LEVEL_ADMIN],
 
 
 	// Users
 	// Users
-	"/^account\/users$/" => ["controller" => "users", "require_admin" => true],
+	"/^account\/users$/" => ["controller" => "users", "require_user_level" => User::LEVEL_TESTER_MANAGER],
 	"/^account\/users\/export\/(email)$/" => ["controller" => "users_export", "params" => ["type"], "require_admin" => true],
 	"/^account\/users\/export\/(email)$/" => ["controller" => "users_export", "params" => ["type"], "require_admin" => true],
-	"/^account\/users\/$id_pattern$/" => ["controller" => "user", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
+	"/^account\/users\/$id_pattern$/" => ["controller" => "user", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
 	"/^account\/users\/$id_pattern\/edit$/" => ["controller" => "user_edit", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/users\/$id_pattern\/edit$/" => ["controller" => "user_edit", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
-	"/^account\/users\/$id_pattern\/verify$/" => ["controller" => "user_verify", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
-	"/^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],
+	"/^account\/users\/$id_pattern\/verify$/" => ["controller" => "user_verify", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/users\/$id_pattern\/verify\/(id-document|photo)$/" => ["controller" => "user_verify_image", "params" => ["id", "type"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/users\/$id_pattern\/(id-document|photo)$/" => ["controller" => "user_verify_image", "params" => ["id", "type"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
 
 
-	"/^api\/users\/$id_pattern\/(get-addresses|get-locations)$/" => ["controller" => "user_ajax", "params" => ["id", "action"], "require_user_level" => User::LEVEL_ADMIN],
+	"/^api\/users\/$id_pattern\/(get-addresses|get-locations)$/" => ["controller" => "user_ajax", "params" => ["id", "action"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
 
 
 	// Locations
 	// Locations
 	"/^account\/locations$/" => ["controller" => "locations", "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^account\/locations$/" => ["controller" => "locations", "require_user_level" => User::LEVEL_CUSTOMER],
@@ -125,10 +125,10 @@ $routes = [
 	"/^account\/locations\/$id_pattern\/photos\/$id_pattern$/" => ["controller" => "location_photo", "params" => ["location_id", "id"]],
 	"/^account\/locations\/$id_pattern\/photos\/$id_pattern$/" => ["controller" => "location_photo", "params" => ["location_id", "id"]],
 
 
 	// Customers
 	// Customers
-	"/^account\/customers$/" => ["controller" => "customers", "require_user_level" => User::LEVEL_ADMIN],
+	"/^account\/customers$/" => ["controller" => "customers", "require_user_level" => User::LEVEL_TESTER_MANAGER],
 	"/^account\/customers\/add$/" => ["controller" => "customer_add", "require_user_level" => User::LEVEL_SUPERADMIN],
 	"/^account\/customers\/add$/" => ["controller" => "customer_add", "require_user_level" => User::LEVEL_SUPERADMIN],
-	"/^account\/customers\/$id_pattern$/" => ["controller" => "customer_view", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
-	"/^account\/customers\/$id_pattern\/edit$/" => ["controller" => "customer_edit", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
+	"/^account\/customers\/$id_pattern$/" => ["controller" => "customer_view", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
+	"/^account\/customers\/$id_pattern\/edit$/" => ["controller" => "customer_edit", "params" => ["id"], "require_user_level" => User::LEVEL_TESTER_MANAGER],
 
 
 	"/^api\/customers\/$id_pattern\/(get-locations)$/" => ["controller" => "customer_ajax", "params" => ["id", "action"], "require_user_level" => User::LEVEL_CUSTOMER],
 	"/^api\/customers\/$id_pattern\/(get-locations)$/" => ["controller" => "customer_ajax", "params" => ["id", "action"], "require_user_level" => User::LEVEL_CUSTOMER],
 
 

+ 10 - 2
views/project.php

@@ -5,6 +5,8 @@ $time_of_day_text = $project->getTimeOfDayText();
 
 
 $template_keys = $project->getTemplateKeys();
 $template_keys = $project->getTemplateKeys();
 
 
+$user = Core::$user;
+
 ?>
 ?>
 
 
 <script>
 <script>
@@ -34,7 +36,7 @@ var projectID = <?=$project->id?>;
 		</div>
 		</div>
 		<div class="col text-right">
 		<div class="col text-right">
 		<?php
 		<?php
-		if(Core::$user->level >= User::LEVEL_ADMIN) {
+		if($user->canAccessProjects()) {
 			?>
 			?>
 			<div class="dropdown">
 			<div class="dropdown">
 				<button class="btn btn-secondary dropdown-toggle" type="button" id="actions-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 				<button class="btn btn-secondary dropdown-toggle" type="button" id="actions-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -42,7 +44,13 @@ var projectID = <?=$project->id?>;
 				</button>
 				</button>
 				<div class="dropdown-menu dropdown-menu-right" aria-labelledby="actions-button">
 				<div class="dropdown-menu dropdown-menu-right" aria-labelledby="actions-button">
 					<a class="dropdown-item" href="/account/projects/<?=$project->id?>/edit">Edit</a>
 					<a class="dropdown-item" href="/account/projects/<?=$project->id?>/edit">Edit</a>
-					<a class="dropdown-item" href="/account/projects/<?=$project->id?>/export-admin-csv">Export CSV</a>
+					<?php
+					if($user->canExportProjectCsv()) {
+						?>
+						<a class="dropdown-item" href="/account/projects/<?=$project->id?>/export-admin-csv">Export CSV</a>
+						<?php
+					}
+					?>
 					<a class="dropdown-item" href="/account/projects/<?=$project->id?>/export-customer-csv">Export Customer CSV</a>
 					<a class="dropdown-item" href="/account/projects/<?=$project->id?>/export-customer-csv">Export Customer CSV</a>
 					<a class="dropdown-item" href="/account/projects/<?=$project->id?>/export-kml">Export KML</a>
 					<a class="dropdown-item" href="/account/projects/<?=$project->id?>/export-kml">Export KML</a>
 					<?php
 					<?php

+ 10 - 3
views/projects.php

@@ -1,6 +1,7 @@
 <?php
 <?php
 
 
 $report_months = array_reverse(Project::getReportMonths());
 $report_months = array_reverse(Project::getReportMonths());
+$user = Core::$user;
 
 
 ?>
 ?>
 <div class="container mt-3 py-4">
 <div class="container mt-3 py-4">
@@ -105,13 +106,19 @@ $report_months = array_reverse(Project::getReportMonths());
 			<div class="col-md-6 offset-md-6">
 			<div class="col-md-6 offset-md-6">
 				<div class="input-group">
 				<div class="input-group">
 					<div class="input-group-prepend">
 					<div class="input-group-prepend">
-						<span class="input-group-text">
+						<label class="input-group-text" for="batch-action">
 							Batch Action
 							Batch Action
-						</span>
+						</label>
 					</div>
 					</div>
 					<select class="form-control" id="batch-action" required>
 					<select class="form-control" id="batch-action" required>
 						<option value="">Select Action</option>
 						<option value="">Select Action</option>
-						<option value="export-admin-csv">Export CSV</option>
+						<?php
+						if($user->canExportProjectCsv()) {
+							?>
+							<option value="export-admin-csv">Export CSV</option>
+							<?php
+						}
+						?>
 						<option value="export-customer-csv">Export Customer CSV</option>
 						<option value="export-customer-csv">Export Customer CSV</option>
 						<option value="export-quickbooks-customer-csv">Export Quickbooks Customer CSV</option>
 						<option value="export-quickbooks-customer-csv">Export Quickbooks Customer CSV</option>
 						<option value="export-quickbooks-tester-csv">Export Quickbooks Tester CSV</option>
 						<option value="export-quickbooks-tester-csv">Export Quickbooks Tester CSV</option>

+ 13 - 5
views/user.php

@@ -59,12 +59,19 @@ const userId = <?=$user->id?>;
 		<div class="col-auto text-right">
 		<div class="col-auto text-right">
 			<form class="form-inline" method="post">
 			<form class="form-inline" method="post">
 				<input type="hidden" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>" />
 				<input type="hidden" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>" />
-				<div class="btn-group">
-					<a class="btn btn-primary" href="/account/users/<?=$user->id?>/edit">Edit</a>
-					<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-						<span class="sr-only"><?=htmlspecialchars(__("Toggle Dropdown"))?></span>
+				<div class="dropdown">
+
+					<button class="btn btn-primary dropdown-toggle" type="button" id="actions-dropdown-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+						Actions
 					</button>
 					</button>
-					<div class="dropdown-menu dropdown-menu-right">
+					<div class="dropdown-menu dropdown-menu-right" aria-labelledby="actions-dropdown-button">
+						<?php
+						if(Core::$user->canEditUsers()) {
+							?>
+							<a class="dropdown-item" href="/account/users/<?=$user->id?>/edit">Edit</a>
+							<?php
+						}
+						?>
 						<?php
 						<?php
 						if(!$user->activated) {
 						if(!$user->activated) {
 							?>
 							?>
@@ -74,6 +81,7 @@ const userId = <?=$user->id?>;
 						?>
 						?>
 						<button class="dropdown-item" type="submit" name="action" value="send_documentation_email"><?=htmlspecialchars(__("Send Documentation Email"))?></button>
 						<button class="dropdown-item" type="submit" name="action" value="send_documentation_email"><?=htmlspecialchars(__("Send Documentation Email"))?></button>
 					</div>
 					</div>
+
 				</div>
 				</div>
 
 
 			</form>
 			</form>

+ 9 - 3
views/users.php

@@ -198,17 +198,23 @@ $query["sort"] = "SORT";
 					</td>
 					</td>
 					<td class="text-right align-middle">
 					<td class="text-right align-middle">
 					<?php
 					<?php
-					if($user->level == User::LEVEL_UNVERIFIED) {
+					if($user->isUnverified()) {
 						?>
 						?>
 						<a class="btn btn-outline-primary" href="/account/users/<?=$user->id?>/verify">
 						<a class="btn btn-outline-primary" href="/account/users/<?=$user->id?>/verify">
 							Verify...
 							Verify...
 						</a>
 						</a>
 						<?php
 						<?php
 					}
 					}
-					?>
+
+					if(Core::$user->canEditUsers()) {
+						?>
 						<a class="btn btn-outline-primary" href="/account/users/<?=$user->id?>/edit">
 						<a class="btn btn-outline-primary" href="/account/users/<?=$user->id?>/edit">
 							Edit
 							Edit
 						</a>
 						</a>
+						<?php
+					}
+
+					?>
 					</td>
 					</td>
 				</tr>
 				</tr>
 				<?php
 				<?php
@@ -226,4 +232,4 @@ $query["sort"] = "SORT";
 	}
 	}
 	?>
 	?>
 
 
-</div>
+</div>