From cdd97341125e7566ed1c3cb13c61fa51714c0c61 Mon Sep 17 00:00:00 2001
From: Davide Franco <bacula-dev@dflc.ch>
Date: Tue, 21 Dec 2010 17:23:48 +0100
Subject: [PATCH] bacula-web: New features and improvments in jobs page

 - Added Jobs Status filter (completed, failed and canceled)
 - Added more choice in <Jobs per page> list
---
 gui/bacula-web/jobs.php           | 19 +++++++++++++++++++
 gui/bacula-web/style/default.css  | 13 +------------
 gui/bacula-web/templates/jobs.tpl | 22 ++++++++++++++++++----
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php
index c140a6c0b5..07bc885a49 100644
--- a/gui/bacula-web/jobs.php
+++ b/gui/bacula-web/jobs.php
@@ -72,6 +72,23 @@
   $query .= "FROM Job ";
   $query .= "LEFT JOIN Pool ON Job.PoolId=Pool.PoolId ";
   $query .= "LEFT JOIN Status ON Job.JobStatus = Status.JobStatus ";
+  
+  // Filter by status
+  if( isset( $_POST['status'] ) ) {
+	switch( $_POST['status'] )
+	{
+		case 'completed':
+			$query .= "WHERE Job.JobStatus = 'T' ";
+		break;
+		case 'failed':
+			$query .= "WHERE Job.JobStatus = 'f' ";
+		break;
+		case 'canceled':
+			$query .= "WHERE Job.JobStatus = 'A' ";
+		break;
+	}
+  }
+  
   $query .= "ORDER BY Job.EndTime DESC ";
   
   // Determine how many jobs to display
@@ -82,6 +99,8 @@
   
   $jobsresult = $dbSql->db_link->query( $query );
   
+  //var_dump( $_POST );
+  
   if( PEAR::isError( $jobsresult ) ) {
 	  echo "SQL query = $query <br />";
 	  die("Unable to get last failed jobs from catalog" . $jobsresult->getMessage() );
diff --git a/gui/bacula-web/style/default.css b/gui/bacula-web/style/default.css
index 47563384cb..f8dc0bd0f5 100644
--- a/gui/bacula-web/style/default.css
+++ b/gui/bacula-web/style/default.css
@@ -137,21 +137,10 @@ a:hover { color: #736F6E }
 .box table.list
 {
  border-collapse: collapse;
- /*width: 100%;*/
+ /width: 100%;
  margin: 0px;
 }
 
-.box table
-{
- border-collapse: separate;
- margin: 0px;
-}
-
-.box table th {
- font-size: 10pt;
- background-color: #CACACA;
-}
-
 .box table tr td
 {
  padding: 5px;
diff --git a/gui/bacula-web/templates/jobs.tpl b/gui/bacula-web/templates/jobs.tpl
index 344231c1b0..b1d7ce8df5 100644
--- a/gui/bacula-web/templates/jobs.tpl
+++ b/gui/bacula-web/templates/jobs.tpl
@@ -78,19 +78,33 @@
 		<td width="50" class="{$job.Job_classe}">{$job.Level}</td>
 		<td width="80" class="{$job.Job_classe}">{$job.Pool_name}</td>
 	  </tr>
-	{/foreach}
+	  {/foreach}
 	</table>
 	</div> <!-- end div class=listbox -->
+	
 	<form action="jobs.php" method="post">
-	<table>
+	<table class="list" border="0">
 	  <tr>
-		<td class="info" colspan="8">
-			Limit to
+		<td class="info" colspan="5" style="text-align: right;">
+			Jobs / Page
 			<select name="limit">
 				<option value="20">20
 				<option value="40">40
 				<option value="60">60
+				<option value="80">80
+				<option value="100">100
+			</select>
+		</td>
+		<td class="info" width="200">
+			Job Status
+			<select name="status">
+				<option value="Any">Any
+				<option value="completed">Completed
+				<option value="failed">Failed
+				<option value="canceled">Canceled
 			</select>
+		</td>
+		<td class="info" width="120">
 			<input type="submit" value="Update" />
 		</td>
 	  </tr>
-- 
2.39.5