webcron
/
webcron
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 6 Wiki Activity

Fix Sorting of jobs

This commit is contained in:
Jeroen De Meerleer 2021-05-28 19:57:18 +02:00
parent ebc442f5ce
commit f3e89fe99e
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Repository/Job.php
View File

@ -14,17 +14,24 @@ class Job extends Repository
{
public function getAllJobs()
{
$jobsSql = "SELECT * FROM job ORDER by name";
$jobsSql = "SELECT * FROM job";
$jobsStmt = $this->dbcon->prepare($jobsSql);
$jobsRslt = $jobsStmt->executeQuery();
$jobs = $jobsRslt->fetchAllAssociative();
foreach ($jobs as $key=>&$job) {
$job['data'] = json_decode($job['data'], true);
$job['host-displayname'] = $job['data']['host'];
$job['host'] = $job['data']['host'];
$job['service'] = $job['data']['service'] ?? '';
if(!empty($job['data']['containertype']) && $job['data']['containertype'] != 'none') {
$job['host-displayname'] = $job['data']['service'] . ' on ' . $job['data']['host'];
}
}
array_multisort(
array_column($jobs, 'name'), SORT_ASC,
array_column($jobs, 'host'), SORT_ASC,
array_column($jobs, 'service'), SORT_ASC,
$jobs);
return $jobs;
}