|
|
@@ -56,6 +56,30 @@ if($submit) {
|
|
|
if($is_started || $is_unverified) {
|
|
|
// Parse after the test form
|
|
|
$fields = $json->duringTest;
|
|
|
+
|
|
|
+ // Start/End times
|
|
|
+ if($is_started) {
|
|
|
+ $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.");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ $form_exception->addError("Entry Time and Exit Time must be filled in.");
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
foreach($fields as $field) {
|
|
|
@@ -114,27 +138,6 @@ 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.");
|
|
|
- }
|
|
|
- }
|
|
|
- else {
|
|
|
- $form_exception->addError("Entry Time and Exit Time must be filled in.");
|
|
|
- }
|
|
|
-
|
|
|
if($form_exception->hasErrors()) throw $form_exception;
|
|
|
|
|
|
date_default_timezone_set("UTC");
|