|
|
@@ -1,5 +1,7 @@
|
|
|
<?php
|
|
|
|
|
|
+$user = Core::$user;
|
|
|
+
|
|
|
JSON::header();
|
|
|
|
|
|
switch($action) {
|
|
|
@@ -13,19 +15,47 @@ switch($action) {
|
|
|
"user_id" => $user_ids
|
|
|
]);
|
|
|
|
|
|
+ $tests = Test::query([
|
|
|
+ "tester_id" => $user_ids,
|
|
|
+ "status" => Test::STATUS_COMPLETED
|
|
|
+ ]);
|
|
|
+
|
|
|
+ $user_test_timestamps = [];
|
|
|
+ foreach($tests as $test) {
|
|
|
+ $timestamp = $user_test_timestamps[$test->tester_id] ?? 0;
|
|
|
+ $dt_start = new DateTime($test->dts_start, new DateTimeZone("UTC"));
|
|
|
+ $test_timestamp = $dt_start->getTimestamp();
|
|
|
+ if($test_timestamp < $timestamp) continue;
|
|
|
+ $user_test_timestamps[$test->tester_id] = $test_timestamp;
|
|
|
+ }
|
|
|
+
|
|
|
$output = [];
|
|
|
|
|
|
foreach($addresses as $address) {
|
|
|
|
|
|
$user = $users[$address->user_id];
|
|
|
|
|
|
+ $dt_registered = new DateTime($user->dts_registered, new DateTimeZone("UTC"));
|
|
|
+
|
|
|
+ $last_test_timestamp = $user_test_timestamps[$address->user_id] ?? null;
|
|
|
+ $last_test_date = null;
|
|
|
+ if($last_test_timestamp) {
|
|
|
+ $dt_last_test = DateTime::createFromFormat("U", $last_test_timestamp, new DateTimeZone(TIMEZONE));
|
|
|
+ $date_last_test = $dt_last_test->format("d/m/Y");
|
|
|
+ }
|
|
|
|
|
|
$output[] = [
|
|
|
- "id" => $address->id,
|
|
|
- "userId" => $address->user_id,
|
|
|
+ "id" => (int) $address->id,
|
|
|
+ "userId" => (int) $address->user_id,
|
|
|
"name" => $user->getDisplayName(),
|
|
|
"latitude" => (float) $address->latitude,
|
|
|
- "longitude" => (float) $address->longitude
|
|
|
+ "longitude" => (float) $address->longitude,
|
|
|
+ "user" => [
|
|
|
+ "id" => (int) $user->id,
|
|
|
+ "score" => (int) $user->score,
|
|
|
+ "dateRegistered" => $dt_registered->format("d/m/Y"),
|
|
|
+ "dateLastTest" => $date_last_test,
|
|
|
+ ]
|
|
|
];
|
|
|
}
|
|
|
|
|
|
@@ -34,4 +64,4 @@ switch($action) {
|
|
|
]);
|
|
|
|
|
|
break;
|
|
|
-}
|
|
|
+}
|