|
|
@@ -141,7 +141,21 @@ if($submit) {
|
|
|
|
|
|
$addresses = UserAddress::query($nvp);
|
|
|
|
|
|
+
|
|
|
+
|
|
|
$users = User::load(array_column($addresses, "user_id"));
|
|
|
+ $tests = Test::query([
|
|
|
+ "tester_id" => array_column($users, "id"),
|
|
|
+ "dts_start" => new Constraint("IS_NOT_NULL"),
|
|
|
+ ]);
|
|
|
+
|
|
|
+ $user_last_test_times = [];
|
|
|
+ foreach($tests as $test) {
|
|
|
+ $unix_start = strtotime($test->dts_start . " UTC");
|
|
|
+ $current_start = $user_last_test_times[$test->tester_id] ?? 0;
|
|
|
+ if($unix_start > $current_start) $user_last_test_times[$test->tester_id] = $unix_start;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
$pending_tests = Test::query([
|
|
|
"tester_id" => array_column($users, "id"),
|
|
|
@@ -189,6 +203,8 @@ if($submit) {
|
|
|
|
|
|
$max_radius_exceeded = ($distance_miles > $address->max_radius_miles);
|
|
|
|
|
|
+ $time_last_test = $user_last_test_times[$user->id] ?? false;
|
|
|
+
|
|
|
$output[] = [
|
|
|
"id" => (int) $user->id,
|
|
|
"addressId" => (int) $address->id,
|
|
|
@@ -211,7 +227,9 @@ if($submit) {
|
|
|
"levelClass" => $user->getLevelClass(),
|
|
|
"termsAccepted" => boolval($user->terms_accepted),
|
|
|
"reported" => (int) $user->reported,
|
|
|
- "reportedComment" => $user->reported_comment
|
|
|
+ "reportedComment" => $user->reported_comment,
|
|
|
+ "timeRegistered" => strtotime($user->dts_registered . " UTC"),
|
|
|
+ "timeLastTest" => $time_last_test,
|
|
|
];
|
|
|
|
|
|
}
|