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

Add ability for verifiers to mark tests as void; remove ability for testers to mark tests as void

Alan Lam 5 лет назад
Родитель
Сommit
0ee9af279e

+ 56 - 71
controllers/test_tester_form.php

@@ -38,8 +38,6 @@ if($submit) {
 
 		$form_exception = new FormException;
 
-		$void = HTTP::value("void", "int");
-
 		// Parse before the test form
 		if($test->isConfirmed()) {
 			$fields = $json->beforeTest;
@@ -53,11 +51,7 @@ if($submit) {
 
 			// Start/End times
 
-			if($void) {
-				$unix_start = time();
-				$unix_end = time();
-			}
-			else if($has_started) {
+			if($has_started) {
 				$start_override = HTTP::value("start_override");
 				$end_override = HTTP::value("end_override");
 
@@ -83,75 +77,73 @@ if($submit) {
 
 		if(empty($fields)) throw new LogicException(__("No fields can be shown."));
 
-		if(!$void) {
-			foreach($fields as $field) {
-				$name = $field->name ?? false;
-				if(empty($name)) continue; // Not a field
+		foreach($fields as $field) {
+			$name = $field->name ?? false;
+			if(empty($name)) continue; // Not a field
 
-				$required_key = $field->requiredKey ?? null;
-				if($required_key && !in_array($required_key, $template_keys, true)) continue;
+			$required_key = $field->requiredKey ?? null;
+			if($required_key && !in_array($required_key, $template_keys, true)) continue;
 
-				$label = $field->label ?? "";
-				$type = $field->type;
-				$required = $field->required ?? false;
-				$values = $field->values ?? [];
+			$label = $field->label ?? "";
+			$type = $field->type;
+			$required = $field->required ?? false;
+			$values = $field->values ?? [];
 
-				if($type === "file") {
-					$file = (object) $_FILES[$name];
+			if($type === "file") {
+				$file = (object) $_FILES[$name];
 
-					try {
-						if(!$required && $file->error === UPLOAD_ERR_NO_FILE) continue;
-						if($required && $file->error === UPLOAD_ERR_NO_FILE) {
-							throw new Exception("$label is required.");
-						}
+				try {
+					if(!$required && $file->error === UPLOAD_ERR_NO_FILE) continue;
+					if($required && $file->error === UPLOAD_ERR_NO_FILE) {
+						throw new Exception("$label is required.");
+					}
 
-						// Detect upload error
-						if($file->error !== UPLOAD_ERR_OK) throw new Exception(HTTP::getUploadErrorString($file->error));
+					// Detect upload error
+					if($file->error !== UPLOAD_ERR_OK) throw new Exception(HTTP::getUploadErrorString($file->error));
 
-						// Get image details
-						$size = @getimagesize($file->tmp_name);
-						if(!$size) throw new Exception(sprintf(__("The uploaded file for %s is not an image."), $label));
+					// Get image details
+					$size = @getimagesize($file->tmp_name);
+					if(!$size) throw new Exception(sprintf(__("The uploaded file for %s is not an image."), $label));
 
-						[$width, $height, $type] = $size;
-						if($type !== IMAGETYPE_JPEG) throw new Exception(sprintf(__("The uploaded file for %s is not a JPEG."), $label));
+					[$width, $height, $type] = $size;
+					if($type !== IMAGETYPE_JPEG) throw new Exception(sprintf(__("The uploaded file for %s is not a JPEG."), $label));
 
-						// Resize image
-						$output_image = Image::normalise($file->tmp_name);
+					// Resize image
+					$output_image = Image::normalise($file->tmp_name);
 
-						// Write image to disk
-						$output_path = $test->getDirectory() . "/" . $name . ".jpg";
+					// Write image to disk
+					$output_path = $test->getDirectory() . "/" . $name . ".jpg";
 
-						$success = imagejpeg($output_image, $output_path, 60);
-						imagedestroy($output_image);
+					$success = imagejpeg($output_image, $output_path, 60);
+					imagedestroy($output_image);
 
-						if(!$success) throw new Exception(__("Failed to save %s.", $label));
-						if(!file_exists($output_path)) throw new Exception(__("Failed to save %s."));
-					}
-					catch(Exception $e) {
-						$form_exception->addError($e->getMessage());
-					}
+					if(!$success) throw new Exception(__("Failed to save %s.", $label));
+					if(!file_exists($output_path)) throw new Exception(__("Failed to save %s."));
 				}
-				else {
-					$value = http::value($name, "trim");
-					if($value === "") $value = null;
+				catch(Exception $e) {
+					$form_exception->addError($e->getMessage());
+				}
+			}
+			else {
+				$value = http::value($name, "trim");
+				if($value === "") $value = null;
 
-					if($required && $value === null) $form_exception->addError(sprintf(__("%s is required."), $label));
-					if($values && !in_array($value, $values, false)) $form_exception->addError(sprintf(__("Value for %s is invalid."), $label));
+				if($required && $value === null) $form_exception->addError(sprintf(__("%s is required."), $label));
+				if($values && !in_array($value, $values, false)) $form_exception->addError(sprintf(__("Value for %s is invalid."), $label));
 
-					if(in_array($name, Test::TEST_FIELDS, true)) {
-						$test->$name = $value;
-					}
-					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;
-						}
-						$test_value->value = $value;
-						$success = $test_value->commit();
-						if(!$success) $form_exception->addError(sprintf(__("Failed to save value for %s."), $label));
+				if(in_array($name, Test::TEST_FIELDS, true)) {
+					$test->$name = $value;
+				}
+				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;
 					}
+					$test_value->value = $value;
+					$success = $test_value->commit();
+					if(!$success) $form_exception->addError(sprintf(__("Failed to save value for %s."), $label));
 				}
 			}
 		}
@@ -195,16 +187,9 @@ if($submit) {
 				}
 			}
 
-			if($void) {
-				$test->void = 1;
-				$test->void_notes = HTTP::value("void_notes", "trim");
-				if(empty($test->void_notes)) throw new Exception(__("Venue Closed Notes is required."));
-			}
-			else {
-				$test->pass = 1;
-				if($template->hasPassFail()) {
-					$test->pass = ($test->challenge_stage <= $template->getPassStage()) ? 1 : 0; // Pass = Challenged during browsing or before
-				}
+			$test->pass = 1;
+			if($template->hasPassFail()) {
+				$test->pass = ($test->challenge_stage <= $template->getPassStage()) ? 1 : 0; // Pass = Challenged during browsing or before
 			}
 
 			$test->dts_updated = Util::getDateTime();

+ 1 - 0
controllers/test_verify_form.php

@@ -125,6 +125,7 @@ if($submit) {
 			}
 		}
 		else {
+			$test->void = (int) HTTP::value("void", "int");
 			$test->void_notes = HTTP::value("void_notes", "trim");
 		}
 

+ 0 - 13
engine/template.php

@@ -304,19 +304,6 @@ class Template extends Model {
 					</button>
 				</div>
 
-				<p><?=htmlspecialchars(__("If the venue was closed, please enter notes and then click the button below."))?></p>
-
-				<div class="form-group">
-					<label for="void-notes"><?=htmlspecialchars(__("Venue Closed Notes"))?></label>
-					<textarea class="form-control" type="text" name="void_notes" id="void-notes" rows="4" placeholder="<?=htmlspecialchars(__("Enter venue closed notes"))?>"></textarea>
-				</div>
-
-				<div class="form-group">
-					<button class="btn btn-block btn-secondary" type="submit" id="test-void-button">
-						<?=htmlspecialchars(__("Venue Was Closed"))?>
-					</button>
-				</div>
-
 				<div class="text-center">
 					<small class="form-text text-muted d-none" id="test-no-internet-text">
 						<span class="text-danger"><?=htmlspecialchars(__("No Internet Connectivity"))?></span><br />

+ 0 - 15
public/js/app-test.js

@@ -23,18 +23,6 @@ function initialiseTestForm() {
 
 	const $submitButton = $("#test-submit-button");
 
-	const $voidButton = $("#test-void-button");
-	$voidButton.on("click", () => {
-		$("#void").val("1");
-		$submitButton.trigger("click");
-	});
-
-	const $voidNotes = $("#void-notes");
-	$voidNotes.on("input", () => {
-		const hasText = $voidNotes.val().length > 0;
-		$voidButton.prop("disabled", !hasText);
-	}).trigger("input");
-
 	const $noInternetText = $("#test-no-internet-text");
 
 	const $submitStatus = $("#test-submit-status");
@@ -47,7 +35,6 @@ function initialiseTestForm() {
 		$submitStatus.html("Submitting...");
 
 		$submitButton.prop("disabled", true);
-		$voidButton.prop("disabled", true);
 
 		const data = $form.serialize();
 
@@ -68,7 +55,6 @@ function initialiseTestForm() {
 				catch(err) {
 					$submitStatus.html("Error: " + err);
 					$submitButton.prop("disabled", false);
-					$voidButton.prop("disabled", false);
 				}
 			},
 			error: function(request, status, error) {
@@ -76,7 +62,6 @@ function initialiseTestForm() {
 				$submitStatus.html("");
 				$noInternetText.removeClass("d-none");
 				$submitButton.prop("disabled", false);
-				$voidButton.prop("disabled", false);
 			}
 		});
 

+ 16 - 8
views/test_verify_form.php

@@ -156,7 +156,7 @@ function render_card_list_group($details) {
 		<input type="hidden" name="submit" value="<?=$_SESSION["csrf_token"]?>" />
 
 		<div class="row">
-			<div class="col-xl">
+			<div class="col-xl-6">
 				<div class="card mb-3">
 					<div class="card-header">
 						Submitted Data
@@ -198,18 +198,26 @@ function render_card_list_group($details) {
 						}
 					}
 
-					if($test->void) {
-						?>
-						<label for="void-notes">Venue Closed Notes</label>
-						<textarea class="form-control" name="void_notes" id="void-notes" rows="4" placeholder="Enter venue closed notes"><?=htmlspecialchars($test->void_notes)?></textarea>
-						<?php
-					}
+					Form::renderField((object) [
+						"type" => "checkbox",
+						"name" => "void",
+						"value" => $test->void,
+						"label" => __("Venue Closed"),
+					]);
+
+					Form::renderField((object) [
+						"type" => "textarea",
+						"name" => "void_notes",
+						"label" => __("Venue Closed Notes"),
+						"value" => $test->void_notes,
+						"maxLength" => 65535
+					]);
 
 					?>
 					</div>
 				</div>
 			</div>
-			<div class="col-xl">
+			<div class="col-xl-6">
 				<div class="row">
 					<div class="col-md col-xl-12">
 						<div class="card mb-3">