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

Added servicename in overview

This commit is contained in:
Jeroen De Meerleer 2021-05-28 12:25:22 +02:00
parent f9d78ef009
commit 10076d19b6
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Repository/Job.php
View File

@ -14,12 +14,16 @@ class Job extends Repository
{ {
public function getAllJobs() public function getAllJobs()
{ {
$jobsSql = "SELECT * FROM job"; $jobsSql = "SELECT * FROM job ORDER by name";
$jobsStmt = $this->dbcon->prepare($jobsSql); $jobsStmt = $this->dbcon->prepare($jobsSql);
$jobsRslt = $jobsStmt->executeQuery(); $jobsRslt = $jobsStmt->executeQuery();
$jobs = $jobsRslt->fetchAllAssociative(); $jobs = $jobsRslt->fetchAllAssociative();
foreach ($jobs as $key=>&$job) { foreach ($jobs as $key=>&$job) {
$job['data'] = json_decode($job['data'], true); $job['data'] = json_decode($job['data'], true);
$job['host-displayname'] = $job['data']['host'];
if(!empty($job['data']['containertype']) && $job['data']['containertype'] != 'none') {
$job['host-displayname'] = $job['data']['service'] . ' on ' . $job['data']['host'];
}
} }
return $jobs; return $jobs;
} }
@ -332,7 +336,7 @@ class Job extends Repository
switch($values['data']['containertype']) { switch($values['data']['containertype']) {
default: default:
if($values['data']['crontype'] == 'http') break; if($values['data']['crontype'] == 'http' || $values['data']['crontype'] == 'reboot' ) break;
$values['data']['containertype'] = 'none'; $values['data']['containertype'] = 'none';
case 'none': case 'none':
// No options for no container // No options for no container

2
templates/job/index.html.twig
View File

@ -17,7 +17,7 @@
{% for job in jobs %} {% for job in jobs %}
<tr{% if(job.norun == true) %} class="norun"{% endif %}> <tr{% if(job.norun == true) %} class="norun"{% endif %}>
<td class="d-block d-md-table-cell">{{ job.name }}</td> <td class="d-block d-md-table-cell">{{ job.name }}</td>
<td class="d-block d-md-table-cell">{{ job.data.host }}</td> <td class="d-block d-md-table-cell">{{ attribute(job, 'host-displayname') }}</td>
<td class="d-block d-md-table-cell">{{ job.interval | interval }}</td> <td class="d-block d-md-table-cell">{{ job.interval | interval }}</td>
<td class="d-block d-md-table-cell">{{ job.nextrun | date("d/m/Y H:i:s") }}</td> <td class="d-block d-md-table-cell">{{ job.nextrun | date("d/m/Y H:i:s") }}</td>
<td class="text-md-right d-block d-md-table-cell"> <td class="text-md-right d-block d-md-table-cell">