Skip to content

Commit

Permalink
webui: add column start and end to job listings
Browse files Browse the repository at this point in the history
The timestamps when a job has started and finished should be visible
to the user, therefore the columns start and end have been added to
job listings in two places.
  • Loading branch information
fbergkemper committed Feb 25, 2020
1 parent ea49951 commit e45fa41
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
7 changes: 6 additions & 1 deletion webui/module/Client/view/client/client/details.phtml
Expand Up @@ -77,7 +77,8 @@ $this->headTitle($title);
<thead class="bg-primary">
<th><?php echo $this->translate("Job ID"); ?></th>
<th><?php echo $this->translate("Job name"); ?></th>
<th><?php echo $this->translate("Timestamp"); ?></th>
<th><?php echo $this->translate("Start"); ?></th>
<th><?php echo $this->translate("End"); ?></th>
<th><?php echo $this->translate("Fileset"); ?></th>
<th><?php echo $this->translate("Level"); ?></th>
<th><?php echo $this->translate("Files"); ?></th>
Expand Down Expand Up @@ -185,6 +186,10 @@ $this->headTitle($title);
field: 'starttime',
sortable: true,
},
{
field: 'endtime',
sortable: true,
},
{
field: 'fileset',
sortable: true,
Expand Down
20 changes: 11 additions & 9 deletions webui/module/Job/view/job/job/index.phtml
Expand Up @@ -5,7 +5,7 @@
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @copyright Copyright (c) 2013-2020 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -76,6 +76,8 @@ $this->headTitle($title);
<th><?php echo $this->translate("Client"); ?></th>
<th><?php echo $this->translate("Type"); ?></th>
<th><?php echo $this->translate("Level"); ?></th>
<th><?php echo $this->translate("Start"); ?></th>
<th><?php echo $this->translate("End"); ?></th>
<th><?php echo $this->translate("Files"); ?></th>
<th><?php echo $this->translate("Bytes"); ?></th>
<th><?php echo $this->translate("Errors"); ?></th>
Expand Down Expand Up @@ -160,14 +162,6 @@ $this->headTitle($title);
html.push('<th><?php echo $this->translate("Scheduled"); ?></th>');
html.push('<td>' + row.schedtime + '</td>');
html.push('</tr>');
html.push('<tr>');
html.push('<th><?php echo $this->translate("Start"); ?></th>');
html.push('<td>' + row.starttime + '</td>');
html.push('</tr>');
html.push('<tr>');
html.push('<th><?php echo $this->translate("End"); ?></th>');
html.push('<td>' + row.endtime + '</td>');
html.push('</tr>');
html.push('</table>');
html.push('</div>');
return html.join('');
Expand Down Expand Up @@ -229,6 +223,14 @@ $this->headTitle($title);
return formatJobLevel(value);
}
},
{
field: 'starttime',
sortable: true
},
{
field: 'endtime',
sortable: true
},
{
field: 'jobfiles',
sortable: true,
Expand Down

0 comments on commit e45fa41

Please sign in to comment.