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

Add support for testers to override test date/time

Alan Lam 8 лет назад
Родитель
Сommit
1bea2b260d

+ 34 - 3
controllers/practice.php

@@ -42,8 +42,6 @@ if($submit) {
 
 	$previous_timezone = date_default_timezone_get();
 
-	date_default_timezone_set("UTC");
-
 	try {
 		Core::validateCSRFToken($submit);
 
@@ -121,8 +119,28 @@ if($submit) {
 			}
 		}
 
+		// Overrides
+		$start_override = http::getDateTimeFromFields("start_override");
+		$end_override = http::getDateTimeFromFields("end_override");
+
+		$start_unix = null;
+		$end_unix = null;
+
+		if($start_override && $end_override) {
+			$start_unix = strtotime($start_override);
+			$end_unix = strtotime($end_override);
+
+			if($start_unix > $end_unix) $form_exception->addError("Test Start date/time must not be after Test End date/time.");
+			if(!$start_unix && $end_unix && $test->dts_start) {
+				$recorded_start_unix = Util::getUnixTimeFromUTC($test->dts_start);
+				if($end_unix < $recorded_start_unix) $form_exception->addError("Test End date/time cannot be later than the recorded start date/time.");
+			}
+		}
+
 		if($form_exception->hasErrors()) throw $form_exception;
 
+		date_default_timezone_set("UTC");
+
 		// Before the Test
 		if($is_confirmed) {
 			$test->status = Test::STATUS_STARTED;
@@ -142,6 +160,12 @@ if($submit) {
 				$unix_end = $unix_start + floor($duration / 1000); // $duration is milliseconds
 
 				$test->dts_end = date("Y-m-d H:i:s", $unix_end);
+
+				if($start_unix && $end_unix) {
+					$test->dts_start = date("Y-m-d H:i:s", $start_unix);
+					$test->dts_end = date("Y-m-d H:i:s", $end_unix);
+				}
+
 			}
 
 			$test->pass = ($test->challenge_stage <= 2) ? 1 : 0; // Pass = Challenged during browsing or before
@@ -150,12 +174,19 @@ if($submit) {
 			$tests[$id] = $test;
 			$_SESSION["practice_tests"] = $tests;
 
+			JSON::header();
 			JSON::success();
 		}
 
 	}
 	catch(FormException $e) {
-		$e->generateAlerts();
+		if(HTTP::isAJAX()) {
+			JSON::header();
+			$e->generateJSONError();
+		}
+		else {
+			$e->generateAlerts();
+		}
 	}
 	catch(Exception $e) {
 		Core::addAlert("danger", $e->getMessage());

+ 25 - 2
controllers/test.php

@@ -44,8 +44,6 @@ if(Core::$user->level == User::LEVEL_TESTER) {
 
 		$previous_timezone = date_default_timezone_get();
 
-		date_default_timezone_set("UTC");
-
 		try {
 			Core::validateCSRFToken($submit);
 
@@ -133,8 +131,28 @@ if(Core::$user->level == User::LEVEL_TESTER) {
 
 			}
 
+			// Date/Time Overrides
+			$start_override = http::getDateTimeFromFields("start_override");
+			$end_override = http::getDateTimeFromFields("end_override");
+
+			$start_unix = null;
+			$end_unix = null;
+
+			if($start_override && $end_override) {
+				$start_unix = strtotime($start_override);
+				$end_unix = strtotime($end_override);
+
+				if($start_unix > $end_unix) $form_exception->addError("Test Start date/time must not be after Test End date/time.");
+				if(!$start_unix && $end_unix && $test->dts_start) {
+					$recorded_start_unix = Util::getUnixTimeFromUTC($test->dts_start);
+					if($end_unix < $recorded_start_unix) $form_exception->addError("Test End date/time cannot be later than the recorded start date/time.");
+				}
+			}
+
 			if($form_exception->hasErrors()) throw $form_exception;
 
+			date_default_timezone_set("UTC");
+
 			// Before the Test
 			if($is_confirmed) {
 				$test->status = Test::STATUS_STARTED;
@@ -156,6 +174,11 @@ if(Core::$user->level == User::LEVEL_TESTER) {
 					$unix_end = $unix_start + floor($duration / 1000); // $duration is milliseconds
 
 					$test->dts_end = date("Y-m-d H:i:s", $unix_end);
+
+					if($start_unix && $end_unix) {
+						$test->dts_start = date("Y-m-d H:i:s", $start_unix);
+						$test->dts_end = date("Y-m-d H:i:s", $end_unix);
+					}
 				}
 
 				$test->pass = ($test->challenge_stage <= 2) ? 1 : 0; // Pass = Challenged during browsing or before

+ 8 - 0
engine/form_exception.php

@@ -22,4 +22,12 @@ class FormException extends Exception {
 		}
 	}
 
+	public function generateJSONError() {
+		$messages = $this->getErrors();
+
+		JSON::fail([
+			"message" => implode("\n", $messages)
+		]);
+	}
+
 }

+ 4 - 0
engine/http.php

@@ -79,6 +79,10 @@ class HTTP {
 		$minute = http::value($minute_field, "int");
 		$second = http::value($second_field, "int");
 
+		if(strlen($hour) == 0) return false;
+		if(strlen($minute) == 0) return false;
+		if(strlen($second) == 0) return false;
+
 		list($hour, $minute, $second) = array_map(function($part) {
 			return str_pad($part, 2, "0", STR_PAD_LEFT);
 		}, [$hour, $minute, $second]);

+ 89 - 0
engine/template.php

@@ -93,6 +93,95 @@ class Template extends Model {
 				}
 				?>
 
+				<h3>Date/Time Overrides</h3>
+
+				<p>If you are submitting this form outside of the actual test, please use the following fields to specify when you did the test.</p>
+
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="start-override-day">Test Start</label>
+					<div class="col-sm">
+						<select class="form-control w-auto d-inline-block" name="start_override_day" id="start-override-day">
+							<option value="">Day</option>
+							<?php
+							Form::renderDayOptions(date("j"));
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="start_override_month" id="start-override-month">
+							<option value="">Month</option>
+							<?php
+							Form::renderMonthOptions(date("n"));
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="start_override_year" id="start-override-year">
+							<option value="">Year</option>
+							<?php
+							Form::renderYearOptionsDescending(2017, date("Y"), date("Y"));
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="start_override_hour" id="start-override-hour">
+							<option value="">HH</option>
+							<?php
+							Form::renderHourOptions();
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="start_override_minute" id="start-override-minute">
+							<option value="">MM</option>
+							<?php
+							Form::renderMinuteOptions();
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="start_override_second" id="start-override-second">
+							<option value="">SS</option>
+							<?php
+							Form::renderSecondOptions();
+							?>
+						</select>
+					</div>
+				</div>
+
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="end-override-day">Test End</label>
+					<div class="col-sm">
+						<select class="form-control w-auto d-inline-block" name="end_override_day" id="end-override-day">
+							<option value="">Day</option>
+							<?php
+							Form::renderDayOptions(date("j"));
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="end_override_month" id="end-override-month">
+							<option value="">Month</option>
+							<?php
+							Form::renderMonthOptions(date("n"));
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="end_override_year" id="end-override-year">
+							<option value="">Year</option>
+							<?php
+							Form::renderYearOptionsDescending(2017, date("Y"), date("Y"));
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="end_override_hour" id="end-override-hour">
+							<option value="">HH</option>
+							<?php
+							Form::renderHourOptions();
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="end_override_minute" id="end-override-minute">
+							<option value="">MM</option>
+							<?php
+							Form::renderMinuteOptions();
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="end_override_second" id="end-override-second">
+							<option value="">SS</option>
+							<?php
+							Form::renderSecondOptions();
+							?>
+						</select>
+					</div>
+				</div>
+
+
 				<div class="bg-light text-center p-3 mt-3">
 					<input type="hidden" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>" />
 					<button class="btn btn-block btn-primary" type="submit" id="test-submit-button">Submit Test Results</button>

+ 8 - 2
public/js/app-practice-test.js

@@ -82,7 +82,6 @@ function initialiseTestForm() {
 			success: function(data, text) {
 
 				try {
-					var data = $.parseJSON(data);
 					if(!data.success) throw "Unsuccessful.";
 
 					$submitStatus.html("Submitted. Thank you for participating in this test. You will be redirected in three seconds.");
@@ -91,7 +90,14 @@ function initialiseTestForm() {
 					}, 3000);
 				}
 				catch(err) {
-					$submitStatus.html("Error, please try again later.");
+
+					if(data.message) {
+						$submitStatus.html("Error: " + data.message.replace("\n", "<br />"));
+					}
+					else {
+						$submitStatus.html("Error, please try again later.");
+					}
+
 					$submitButton.removeAttr("disabled");
 				}
 			},

+ 22 - 0
views/practice_form.php

@@ -48,6 +48,28 @@ else {
 		}
 
 	}
+
+	?>
+
+	<hr />
+
+	<h3>Test Date/Time</h3>
+
+	<div class="row mb-1">
+		<label class="col-sm-4 col-form-label">Test Start</label>
+		<div class="col-sm">
+			<?=htmlspecialchars($test->dts_start)?>
+		</div>
+	</div>
+
+	<div class="row mb-1">
+		<label class="col-sm-4 col-form-label">Test End</label>
+		<div class="col-sm">
+			<?=htmlspecialchars($test->dts_end)?>
+		</div>
+	</div>
+
+	<?php
 }
 ?>
 </div>