|
|
@@ -59,9 +59,25 @@ if(Core::$user->level == User::LEVEL_TESTER) {
|
|
|
// Parse after the test form
|
|
|
$fields = $json->duringTest;
|
|
|
|
|
|
+ // Start/End times
|
|
|
if($is_started) {
|
|
|
- $duration = http::value("duration", "int");
|
|
|
- if(!$duration) $form_exception->addError("Duration was not submitted.");
|
|
|
+ $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("Entry Time must not be after Exit 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("Exit Time cannot be later than the recorded Entry Time.");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -131,24 +147,6 @@ 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");
|
|
|
@@ -161,6 +159,8 @@ if(Core::$user->level == User::LEVEL_TESTER) {
|
|
|
$success = $test->commit();
|
|
|
if(!$success) throw new Exception("Failed to save test. Please try again later.");
|
|
|
|
|
|
+ Core::addAlert("success", "Photos uploaded successfully.");
|
|
|
+
|
|
|
HTTP::redirect("/account/tests/$id");
|
|
|
|
|
|
}
|
|
|
@@ -170,15 +170,13 @@ if(Core::$user->level == User::LEVEL_TESTER) {
|
|
|
$test->status = Test::STATUS_PENDING_VERIFICATION;
|
|
|
|
|
|
if($is_started) {
|
|
|
- $unix_start = strtotime($test->dts_start);
|
|
|
- $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);
|
|
|
}
|
|
|
+ else if($end_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
|