|
|
@@ -202,68 +202,72 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
|
|
|
$accept = http::value("accept");
|
|
|
$reject = http::value("reject");
|
|
|
|
|
|
- $test->verifier_id = Core::$user->id;
|
|
|
+ if(empty($test->verifier_id)) {
|
|
|
+ $test->verifier_id = Core::$user->id;
|
|
|
+ $test->dts_verified = Util::getDateTime();
|
|
|
+ }
|
|
|
+
|
|
|
$test->verifier_notes = http::value("verifier_notes", "trim");
|
|
|
- $test->dts_verified = Util::getDateTime();
|
|
|
|
|
|
- // Modify values and accept test as completed
|
|
|
- if($accept) {
|
|
|
- $test->status = Test::STATUS_COMPLETED;
|
|
|
+ // Modify test values
|
|
|
|
|
|
- // Overrides
|
|
|
- $unix_start = strtotime($test->dts_start . " UTC");
|
|
|
- $unix_end = strtotime($test->dts_end . " UTC");
|
|
|
+ // Overrides
|
|
|
+ $unix_start = strtotime($test->dts_start . " UTC");
|
|
|
+ $unix_end = strtotime($test->dts_end . " UTC");
|
|
|
|
|
|
- $pass_override = http::value("pass_override");
|
|
|
- if(strlen($pass_override) > 0) {
|
|
|
- $test->pass = $pass_override;
|
|
|
- }
|
|
|
+ $pass_override = http::value("pass_override");
|
|
|
+ if(strlen($pass_override) > 0) {
|
|
|
+ $test->pass = $pass_override;
|
|
|
+ }
|
|
|
|
|
|
- $start_override = http::value("start_override");
|
|
|
- if($start_override) {
|
|
|
- $unix_start = strtotime($start_override);
|
|
|
- }
|
|
|
+ $start_override = http::value("start_override");
|
|
|
+ if($start_override) {
|
|
|
+ $unix_start = strtotime($start_override);
|
|
|
+ }
|
|
|
|
|
|
- $end_override = http::value("end_override");
|
|
|
- if($end_override) {
|
|
|
- $unix_end = strtotime($end_override);
|
|
|
- }
|
|
|
+ $end_override = http::value("end_override");
|
|
|
+ if($end_override) {
|
|
|
+ $unix_end = strtotime($end_override);
|
|
|
+ }
|
|
|
|
|
|
- if($unix_start > $unix_end) {
|
|
|
- $form_exception->addError("Start time cannot be after end time.");
|
|
|
- }
|
|
|
- else {
|
|
|
- $test->dts_start = Util::getDateTime($unix_start);
|
|
|
- $test->dts_end = Util::getDateTime($unix_end);
|
|
|
- }
|
|
|
+ if($unix_start > $unix_end) {
|
|
|
+ $form_exception->addError("Start time cannot be after end time.");
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ $test->dts_start = Util::getDateTime($unix_start);
|
|
|
+ $test->dts_end = Util::getDateTime($unix_end);
|
|
|
+ }
|
|
|
|
|
|
- $test->test_fee = null;
|
|
|
- $tester_fee = http::value("tester_fee", "int");
|
|
|
- if($tester_fee != $project->default_tester_fee) {
|
|
|
- $test->test_fee = $tester_fee;
|
|
|
- }
|
|
|
+ $test->test_fee = null;
|
|
|
+ $tester_fee = http::value("tester_fee", "int");
|
|
|
+ if($tester_fee != $project->default_tester_fee) {
|
|
|
+ $test->test_fee = $tester_fee;
|
|
|
+ }
|
|
|
|
|
|
- // Test forms
|
|
|
- foreach($fields as $field) {
|
|
|
- if($field->type == "header") continue;
|
|
|
- if($field->type == "file") continue;
|
|
|
- if(empty($field->name)) continue;
|
|
|
+ // Test forms
|
|
|
+ foreach($fields as $field) {
|
|
|
+ if($field->type == "header") continue;
|
|
|
+ if($field->type == "file") continue;
|
|
|
+ if(empty($field->name)) continue;
|
|
|
|
|
|
- $value = http::value($field->name, "trim");
|
|
|
+ $value = http::value($field->name, "trim");
|
|
|
|
|
|
- if(in_array($field->name, $fillable_fields)) $test->{$field->name} = $value;
|
|
|
- else {
|
|
|
- $test_value = TestValue::get($id, $field->name);
|
|
|
- if(!$test_value) {
|
|
|
- $test_value = new TestValue;
|
|
|
- $test_value->test_id = $id;
|
|
|
- $test_value->name = $field->name;
|
|
|
- }
|
|
|
- $test_value->value = $value;
|
|
|
- $test_value->commit();
|
|
|
+ if(in_array($field->name, $fillable_fields)) $test->{$field->name} = $value;
|
|
|
+ else {
|
|
|
+ $test_value = TestValue::get($id, $field->name);
|
|
|
+ if(!$test_value) {
|
|
|
+ $test_value = new TestValue;
|
|
|
+ $test_value->test_id = $id;
|
|
|
+ $test_value->name = $field->name;
|
|
|
}
|
|
|
+ $test_value->value = $value;
|
|
|
+ $test_value->commit();
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
+ // Accept test as completed
|
|
|
+ if($accept) {
|
|
|
+ $test->status = Test::STATUS_COMPLETED;
|
|
|
// TODO: Send email to venue/HQ/tester
|
|
|
}
|
|
|
|