lukasplevac/YAGS
1
0
Fork 0
mirror of https://github.com/Lukas0025/YAGS.git synced 2025-04-04 06:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get last observation as success observation

Browse Source
This commit is contained in:
Lukáš Plevač 2023-10-09 15:09:49 +02:00
parent a5e6f3d55b
commit 5a7463e3f9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
station/config.py
View File

@ -1,4 +1,4 @@
masterUrl = "http://10.0.0.8"
apiKey = "783439f5-be14-4877-a396-6d8bc4783c3c"
apiKey = "a22c1e54-d35c-4058-993d-9f34c0fba428"
pullInterval = 120 # in sec
planInterval = 1200 # in sec

8
web/CONTROLLERS/targets.php
View File

@ -12,14 +12,18 @@
$targets = (new \wsos\database\core\table(\DAL\target::class))->getAll();
// create planed template observations
$ob = new \DAL\observation();
foreach ($targets->values as $target) {
$last = (new \wsos\database\core\table(\DAL\observation::class))->query("transmitter.target.id = ?", [$target->id->get()], "DESC end", 1);
$last = (new \wsos\database\core\table(\DAL\observation::class))->query("transmitter.target.id == ? && status == ?", [$target->id->get(), $ob->status->getVal("success")], "DESC end", 1);
$last = $last->len() > 0 ? "ago " . $last->values[0]->end->strDelta() : "never";
$observations = (new \wsos\database\core\table(\DAL\observation::class))->count("transmitter.target.id = ?", [$target->id->get()]);
$observations = (new \wsos\database\core\table(\DAL\observation::class))->count("transmitter.target.id == ?", [$target->id->get()]);
$context["targets"]->append([
"id" => $target->id->get(),
"name" => $target->name->get(),
"orbit" => $target->orbit->get(),
"type" => $target->type->get()->name->get(),