dashboard collapsable job listings

bareos · Dec 17, 2013 · 03db300 · 03db300
1 parent e310c59
commit 03db300
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/module/Dashboard/view/dashboard/dashboard/index.phtml b/module/Dashboard/view/dashboard/dashboard/index.phtml
@@ -92,10 +92,14 @@ $flash->setMessageOpenFormat('
 	<div class="panel panel-info">
 
             <div class="panel-heading">
-                <h3 class="panel-title"><?php echo $this->translate('Running jobs') ?></h3>
+                <h3 class="panel-title">
+		<span class="glyphicon glyphicon-list"></span>
+		<a data-toggle="collapse" href="#collapseRunning"><?php echo $this->translate('Running jobs') ?></a>
+		<span class="caret"></span>
+		</h3>
             </div>
 
-	    <div class="panel-body">
+	    <div class="panel-body panel-collapse collapse out" id="collapseRunning">
 
             <table class="table table-striped table-hover" style="font-size: 9pt;">
 
@@ -106,7 +110,7 @@ $flash->setMessageOpenFormat('
 		<th>Type</th>
 		<th>Level</th>
 		<th>Start</th>
-		<th>Duration</th>
+		<!-- <th>Duration</th> -->
 		<th>Status</th>
 		<th>Log</th>
 	    </tr>
@@ -121,7 +125,7 @@ $flash->setMessageOpenFormat('
 	      <td><?php echo $this->printJobType($item->type); ?></td>
 	      <td><?php echo $this->printJobLevel($item->level); ?></td>
 	      <td><?php echo $this->escapeHtml($item->starttime); ?></td>
-	      <td><?php echo $this->printJobDuration($item->starttime, $item->endtime); ?></td>
+	      <!-- <td><?php echo $this->printJobDuration($item->starttime, $item->endtime); ?></td> -->
 	      <td><?php echo $this->printJobStatus($item->jobstatus); ?></td>
 	      <td><a href="<?php echo $this->url('log', array('action' => 'job', 'id' => $item->jobid)); ?>"><span class="glyphicon glyphicon-file"></a></td>
 
@@ -157,10 +161,14 @@ $flash->setMessageOpenFormat('
 	<div class="panel panel-default">
 
             <div class="panel-heading">
-                <h3 class="panel-title"><?php echo $this->translate('Waiting jobs') ?></h3>
+                <h3 class="panel-title">
+		<span class="glyphicon glyphicon-list"></span>
+		<a data-toggle="collapse" href="#collapseWaiting"><?php echo $this->translate('Waiting jobs') ?></a>
+		<span class="caret"></span>
+		</h3>
             </div>
 
-	    <div class="panel-body">
+	    <div class="panel-body panel-collapse collapse out" id="collapseWaiting">
 
             <table class="table table-striped table-hover" style="font-size: 9pt;">
 
@@ -171,7 +179,7 @@ $flash->setMessageOpenFormat('
 		<th>Type</th>
 		<th>Level</th>
 		<th>Start</th>
-		<th>Duration</th>
+		<!-- <th>Duration</th> -->
 		<th>Status</th>
 		<th>Log</th>
 	    </tr>
@@ -186,7 +194,7 @@ $flash->setMessageOpenFormat('
 	      <td><?php echo $this->printJobType($item->type); ?></td>
 	      <td><?php echo $this->printJobLevel($item->level); ?></td>
 	      <td><?php echo $this->escapeHtml($item->starttime); ?></td>
-	      <td><?php echo $this->printJobDuration($item->starttime, $item->endtime); ?></td>
+	      <!-- <td><?php echo $this->printJobDuration($item->starttime, $item->endtime); ?></td> -->
 	      <td><?php echo $this->printJobStatus($item->jobstatus); ?></td>
 	      <td><a href="<?php echo $this->url('log', array('action' => 'job', 'id' => $item->jobid)); ?>"><span class="glyphicon glyphicon-file"></a></td>
 
@@ -222,10 +230,14 @@ $flash->setMessageOpenFormat('
 	<div class="panel panel-danger">
 
             <div class="panel-heading">
-                <h3 class="panel-title"><?php echo $this->translate('Unsuccessful jobs (last 24 hours)') ?></h3>
+                <h3 class="panel-title">
+		<span class="glyphicon glyphicon-list"></span>
+		<a data-toggle="collapse" href="#collapseUnsuccessful"><?php echo $this->translate('Unsuccessful jobs (last 24 hours)') ?></a>
+		<span class="caret"></span>
+		</h3>
             </div>
 
-	    <div class="panel-body">
+	    <div class="panel-body panel-collapse collapse out" id="collapseUnsuccessful">
 
             <table class="table table-striped table-hover" style="font-size: 9pt;">
 

diff --git a/module/Job/src/Job/Model/JobTable.php b/module/Job/src/Job/Model/JobTable.php
@@ -84,7 +84,8 @@ public function getWaitingJobs()
 				jobstatus = 'c' OR 
 				jobstatus = 'd' OR 
 				jobstatus = 't' OR 
-				jobstatus = 'p'");
+				jobstatus = 'p' OR
+				jobstatus = 'C'");
 
 		$resultSet = $this->tableGateway->selectWith($select);