Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Nothing special
Just a few modifications and preparations for new features
  • Loading branch information
fbergkemper committed Nov 5, 2013
1 parent 51b02cd commit 43c6caf
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 26 deletions.
8 changes: 4 additions & 4 deletions module/Dashboard/view/dashboard/dashboard/index.phtml
Expand Up @@ -99,14 +99,14 @@ $this->headTitle($title);

<td><a href="<?php echo $this->url('job', array('action' => 'details', 'id' => $jobUnsuccess->jobid)); ?>"><?php echo $this->escapeHtml($jobUnsuccess->jobid); ?></a></td>
<td><?php echo $this->escapeHtml($jobSuccess->jobname); ?></td>
<td><a href="<?php echo $this->url('client', array('action' => 'details', 'clientid' => $jobUnsuccess->clientid)); ?>"><?php echo $this->escapeHtml($jobUnsuccess->clientname); ?></a></td>
<td><a href="<?php echo $this->url('client', array('action' => 'details', 'id' => $jobUnsuccess->clientid)); ?>"><?php echo $this->escapeHtml($jobUnsuccess->clientname); ?></a></td>
<td><?php echo $this->printJobType($jobUnsuccess->type); ?></td>
<td><?php echo $this->printJobLevel($jobUnsuccess->level); ?></td>
<td><?php echo $this->escapeHtml($jobUnsuccess->starttime); ?></td>
<td><?php echo $this->escapeHtml($jobUnsuccess->endtime); ?></td>
<td><?php echo $this->printJobDuration($jobUnsuccess->starttime, $jobUnsuccess->endtime); ?></td>
<td><?php echo $this->printJobStatus($jobUnsuccess->jobstatus); ?></td>
<td><a href="<?php echo $this->url('log', array('action' => 'job', 'jobid' => $jobUnsuccess->clientid)); ?>">View</a></td>
<td><a href="<?php echo $this->url('log', array('action' => 'job', 'id' => $jobUnsuccess->jobid)); ?>">View</a></td>

</tr>

Expand Down Expand Up @@ -160,14 +160,14 @@ $this->headTitle($title);

<td><a href="<?php echo $this->url('job', array('action' => 'details', 'id' => $jobSuccess->jobid)); ?>"><?php echo $this->escapeHtml($jobSuccess->jobid); ?></a></td>
<td><?php echo $this->escapeHtml($jobSuccess->jobname); ?></td>
<td><a href="<?php echo $this->url('client', array('action' => 'details', 'clientid' => $jobSuccess->clientid)); ?>"><?php echo $this->escapeHtml($jobSuccess->clientname); ?></a></td>
<td><a href="<?php echo $this->url('client', array('action' => 'details', 'id' => $jobSuccess->clientid)); ?>"><?php echo $this->escapeHtml($jobSuccess->clientname); ?></a></td>
<td><?php echo $this->printJobType($jobSuccess->type); ?></td>
<td><?php echo $this->printJobLevel($jobSuccess->level); ?></td>
<td><?php echo $this->escapeHtml($jobSuccess->starttime); ?></td>
<td><?php echo $this->escapeHtml($jobSuccess->endtime); ?></td>
<td><?php echo $this->printJobDuration($jobSuccess->starttime, $jobSuccess->endtime); ?></td>
<td><?php echo $this->printJobStatus($jobSuccess->jobstatus); ?></td>
<td><a href="<?php echo $this->url('log', array('action' => 'job', 'jobid' => $jobSuccess->clientid)); ?>">View</a></td>
<td><a href="<?php echo $this->url('log', array('action' => 'job', 'id' => $jobSuccess->jobid)); ?>">View</a></td>

</tr>

Expand Down
2 changes: 1 addition & 1 deletion module/Job/src/Job/Controller/JobController.php
Expand Up @@ -15,7 +15,7 @@ public function indexAction()

$paginator = $this->getJobTable()->fetchAll(true);
$paginator->setCurrentPageNumber( (int) $this->params()->fromQuery('page', 1) );
$paginator->setItemCountPerPage(10);
$paginator->setItemCountPerPage(15);

return new ViewModel(array('paginator' => $paginator));

Expand Down
2 changes: 1 addition & 1 deletion module/Job/view/job/job/details.phtml
Expand Up @@ -23,7 +23,7 @@ $this->headTitle($title);
<table class="table table-striped table-hover">
<tr><td>Job</td><td><?php echo $this->escapeHtml($job->jobid); ?></td></tr>
<tr><td>Name</td><td><?php echo $this->escapeHtml($job->jobname); ?></td></tr>
<tr><td>Client</td><td><a href="<?php echo $this->url('client', array('action' => 'details', 'clientid' => $job->clientid)); ?>"><?php echo $this->escapeHtml($job->clientname); ?></a></td></tr>
<tr><td>Client</td><td><a href="<?php echo $this->url('client', array('action' => 'details', 'id' => $job->clientid)); ?>"><?php echo $this->escapeHtml($job->clientname); ?></a></td></tr>
<tr><td>Type</td><td><?php echo $this->printJobType($job->type); ?></td></tr>
<tr><td>Level</td><td><?php echo $this->printJobLevel($job->level); ?></td></tr>
<tr><td>Scheduled start</td><td><?php echo $this->printDate($job->schedtime, 'long'); ?></td></tr>
Expand Down
52 changes: 37 additions & 15 deletions module/Job/view/job/job/index.phtml
@@ -1,25 +1,44 @@
<?php

$title = 'Job';
$title = 'Job history';
$this->headTitle($title);

?>

<h2><?php echo $title; ?></h2>
<hr />

<?php foreach ($this->paginator as $job) : ?>
<div class="row">

<div class="col-md-12">
<div class="panel panel-default">
<div class="col-md-2">

<div class="panel panel-default">

<div class="panel-heading">
<h3 class="panel-title"><?php echo "Job " . $this->escapeHtml($job->jobid); ?></h3>
</div>
<div class="panel-heading">
<h3 class="panel-title"><?php echo $this->translate('Job'); ?></h3>
</div>

<div class="panel-body">

<table class="table" style="font-size: 9pt;">
<tr><td><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Job history'); ?></a></td></tr>
<tr><td><a href="<?php echo $this->url('job', array('action'=>'todo')); ?>"><?php echo $this->translate('Running jobs'); ?></a></td></tr>
<tr><td><a href="<?php echo $this->url('job', array('action'=>'todo')); ?>"><?php echo $this->translate('todo'); ?></a></td></tr>
<tr><td><a href="<?php echo $this->url('job', array('action'=>'todo')); ?>"><?php echo $this->translate('Job timeline'); ?></a></td></tr>
</table>

</div>

</div>

</div>

<div class="col-md-10">

<div class="panel panel-default">
<div class="panel-body">

<table class="table table-striped table-hover">
<table class="table table-striped table-hover" style="font-size: 9pt;">

<tr>
<th>Job</th>
Expand All @@ -35,30 +54,29 @@ $this->headTitle($title);

</tr>

<?php foreach ($this->paginator as $job) : ?>

<tr>

<td><a href="<?php echo $this->url('job', array('action' => 'details', 'id' => $job->jobid)); ?>"><?php echo $this->escapeHtml($job->jobid); ?></a></td>
<td><?php echo $this->escapeHtml($job->jobname); ?></td>
<td><a href="<?php echo $this->url('client', array('action' => 'details', 'clientid' => $job->clientid)); ?>"><?php echo $this->escapeHtml($job->clientname); ?></a></td>
<td><a href="<?php echo $this->url('client', array('action' => 'details', 'id' => $job->clientid)); ?>"><?php echo $this->escapeHtml($job->clientname); ?></a></td>
<td><?php echo $this->printJobType($job->type); ?></td>
<td><?php echo $this->printJobLevel($job->level); ?></td>
<td><?php echo $this->escapeHtml($job->starttime); ?></td>
<td><?php echo $this->escapeHtml($job->endtime); ?></td>
<td><?php echo $this->printJobDuration($job->starttime, $job->endtime); ?></td>
<td><?php echo $this->printJobStatus($job->jobstatus); ?></td>
<td><a href="<?php echo $this->url('log', array('action' => 'job', 'jobid' => $job->clientid)); ?>">View</a></td>
<td><a href="<?php echo $this->url('log', array('action' => 'job', 'id' => $job->jobid)); ?>">View</a></td>

</tr>

<?php endforeach; ?>

</table>

</div>
</div>
</div>

<?php endforeach; ?>



<?php

Expand All @@ -70,3 +88,7 @@ echo $this->paginationControl(
);

?>

</div>

</div>
12 changes: 12 additions & 0 deletions module/Log/src/Log/Controller/LogController.php
Expand Up @@ -33,6 +33,18 @@ public function detailsAction()
));
}

public function jobAction()
{
$id = (int) $this->params()->fromRoute('id', 0);
if (!$id) {
return $this->redirect()->toRoute('log');
}

return new ViewModel(array(
'log' => $this->getLogTable()->getLogsByJob($id),
));
}

public function getLogTable()
{
if(!$this->logTable) {
Expand Down
5 changes: 5 additions & 0 deletions module/Log/src/Log/Model/LogTable.php
Expand Up @@ -48,6 +48,11 @@ public function getLog($logid)
return $row;
}

public function getLogsByJob($id)
{

}

public function getLogNum()
{
$select = new Select();
Expand Down
9 changes: 8 additions & 1 deletion module/Log/view/log/log/index.phtml
Expand Up @@ -8,7 +8,10 @@ $this->headTitle($title);
<h2><?php echo $title; ?></h2>
<hr />

<table class="table table-striped table-hover">
<div class="panel panel-default">
<div class="panel-body">

<table class="table table-striped table-hover" style="font-size: 9pt;">

<tr>
<th>Log</th>
Expand All @@ -32,6 +35,9 @@ $this->headTitle($title);

</table>

</div>
</div>

<?php

echo $this->paginationControl(
Expand All @@ -42,3 +48,4 @@ echo $this->paginationControl(
);

?>

2 changes: 1 addition & 1 deletion module/Media/view/media/media/details.phtml
Expand Up @@ -56,7 +56,7 @@ $this->headTitle($title);

<div class="panel-body">

<table class="table table-striped table-hover">
<table class="table table-striped table-hover" style="font-size: 9pt;">
<tr><td>Volume ID</td><td><a href="<?php echo $this->url('media', array('action'=>'details', 'id' => $media->mediaid)); ?>"><?php echo $this->escapeHtml($media->mediaid); ?></a></td></tr>
<tr><td>Volumename</td><td><?php echo $this->escapeHtml($media->volumename); ?></td></tr>
<tr><td>Mediatype</td><td><?php echo $this->escapeHtml($media->mediatype); ?></td></tr>
Expand Down
6 changes: 3 additions & 3 deletions module/Pool/view/pool/pool/index.phtml
Expand Up @@ -19,7 +19,7 @@ $this->headTitle($title);

<div class="panel-body">

<table class="table table-striped table-hover">
<table class="table table-striped table-hover" style="font-size: 9pt;">

<tr>
<th>Pool ID</th>
Expand All @@ -37,8 +37,8 @@ $this->headTitle($title);

<tr>

<td><a href="<?php echo $this->url('pool', array('action'=>'details')); ?>"><?php echo $this->escapeHtml($pool->poolid); ?></a></td>
<td><a href="<?php echo $this->url('pool', array('action'=>'details')); ?>"><?php echo $this->escapeHtml($pool->name); ?></a></td>
<td><a href="<?php echo $this->url('pool', array('action'=>'details', 'id' => $pool->poolid)); ?>"><?php echo $this->escapeHtml($pool->poolid); ?></a></td>
<td><a href="<?php echo $this->url('pool', array('action'=>'details', 'id' => $pool->poolid)); ?>"><?php echo $this->escapeHtml($pool->name); ?></a></td>
<td><?php echo $this->escapeHtml($pool->pooltype); ?></td>
<td><?php echo $this->escapeHtml($pool->numvols); ?></td>
<td><?php echo $this->escapeHtml($pool->maxvols); ?></td>
Expand Down

0 comments on commit 43c6caf

Please sign in to comment.