X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=gui%2Fbacula-web%2Fjobs.php;h=5fb6fafbdbb79d44e282f18a7d3b17ee6699d5c9;hb=bed4d6c620101ad0893a1eb28bfdb7bcf7511b00;hp=fba9becf79635456a005ea8a7e2fc511e831abc9;hpb=61c02072e82a18551d12776cdb6446af4ff26255;p=bacula%2Fbacula

diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php
index fba9becf79..5fb6fafbdb 100644
--- a/gui/bacula-web/jobs.php
+++ b/gui/bacula-web/jobs.php
@@ -8,8 +8,6 @@
   $smarty = new Smarty();     
   $dbSql = new Bweb();
 
-  require("lang.php");
-
   // Smarty configuration
   $smarty->compile_check = true;
   $smarty->debugging = false;
@@ -19,65 +17,41 @@
   $smarty->compile_dir = "./templates_c";
   $smarty->config_dir     = "./configs";
   
-  // Global variables
-  $job_status = array( 'D' => 'Diff', 'I' => 'Incr', 'F' => 'Full' );
-
-  // Running jobs
-  $running_jobs = array();
-  
-  $query  = "SELECT Job.JobId, Job.JobStatus, Status.JobStatusLong, Job.Name, Job.StartTime, Job.EndTime, Job.Level, Pool.Name AS Pool_name ";
-  $query .= "FROM Job ";
-  $query .= "JOIN Status ON Job.JobStatus = Status.JobStatus ";
-  $query .= "LEFT JOIN Pool ON Job.PoolId = Pool.PoolId ";
-  $query .= "WHERE Job.JobStatus IN ('F','S','M','m','s','j','c','d','t','C','R')";
-  $query .= "ORDER BY JobId";
+  // Jobs list
+  $query 	   = "";
+  $last_jobs = array();
   
-  $jobsresult = $dbSql->db_link->query( $query );
+  // Job Status list
+  $job_status = array( 'Any', 'Waiting', 'Running', 'Completed', 'Failed', 'Canceled' );
+  $smarty->assign( 'job_status', $job_status );
   
-  if( PEAR::isError( $jobsresult ) ) {
-	  echo "SQL query = $query <br />";
-	  die("Unable to get last failed jobs from catalog" . $jobsresult->getMessage() );
-  }else {
-	  while( $job = $jobsresult->fetchRow( DB_FETCHMODE_ASSOC ) ) {
-	
-		// Elapsed time for this job
-		$elapsed = 'N/A';
-		if( $job['JobStatus'] == 'R' )
-			$job['elapsed_time'] = $dbSql->Get_ElapsedTime( strtotime($job['StartTime']), time() );
-		else
-			$job['elapsed_time'] = 'N/A';
-			
-		// Odd or even row
-		if( count($running_jobs) % 2)
-			$job['Job_classe'] = 'odd';
+  // Jobs per page
+  $jobs_per_page = array( 25,50,75,100,150 );
+  $smarty->assign( 'jobs_per_page', $jobs_per_page );
 
-		// Job Status
-		$job['Level'] = $job_status[ $job['Level'] ];
-		
-		array_push( $running_jobs, $job);
-	  }
-  }
-  
-  $smarty->assign( 'running_jobs', $running_jobs );
-  
-  // Get the last jobs list
-  $query 	   = "";
-  $last_jobs = array();
+  // Global variables
+  $job_level = array( 'D' => 'Diff', 'I' => 'Incr', 'F' => 'Full' );
   
-  $query .= "SELECT Job.JobId, Job.Name AS Job_name, Job.StartTime, Job.EndTime, Job.Level, Pool.Name, Job.JobStatus, Pool.Name AS Pool_name, Status.JobStatusLong ";
+  $query .= "SELECT Job.JobId, Job.Name AS Job_name, Job.StartTime, Job.EndTime, Job.Level, Job.JobBytes, Job.JobFiles, Pool.Name, Job.JobStatus, Pool.Name AS Pool_name, Status.JobStatusLong ";
   $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'] )
+	switch( strtolower( $_POST['status'] ) )
 	{
+		case 'running':
+			$query .= "WHERE Job.JobStatus = 'R' ";
+		break;
+		case 'waiting':
+			$query .= "WHERE Job.JobStatus IN ('F','S','M','m','s','j','c','d','t','C') ";
+		break;
 		case 'completed':
 			$query .= "WHERE Job.JobStatus = 'T' ";
 		break;
 		case 'failed':
-			$query .= "WHERE Job.JobStatus = 'f' ";
+			$query .= "WHERE Job.JobStatus IN ('f','E') ";
 		break;
 		case 'canceled':
 			$query .= "WHERE Job.JobStatus = 'A' ";
@@ -85,13 +59,16 @@
 	}
   }
   
-  $query .= "ORDER BY Job.EndTime DESC ";
+  // order by
+  $query .= "ORDER BY Job.JobId DESC ";
   
   // Determine how many jobs to display
-  if( isset($_POST['limit']) )
-	$query .= "LIMIT " . $_POST['limit'];
+  if( isset($_POST['jobs_per_page']) )
+	$query .= "LIMIT " . $_POST['jobs_per_page'];
   else
-	$query .= "LIMIT 20 ";
+	$query .= "LIMIT 25 ";
+  
+  //echo $query . '<br />';
   
   $jobsresult = $dbSql->db_link->query( $query );
   
@@ -100,27 +77,58 @@
 	  die("Unable to get last failed jobs from catalog" . $jobsresult->getMessage() );
   }else {
 	  while( $job = $jobsresult->fetchRow( DB_FETCHMODE_ASSOC ) ) {
-		// Determine icon for job
-		if( $job['JobStatus'] == 'T' )
-			$job['Job_icon'] = "s_ok.gif";
-		else
-			$job['Job_icon'] = "s_error.gif";
+		
+		// Determine icon for job status
+		switch( $job['JobStatus'] ) {
+			case 'R':
+				$job['Job_icon'] = "running.png";
+			break;
+			case 'T':
+				$job['Job_icon'] = "s_ok.png";
+			break;
+			case 'A':
+			case 'f':
+			case 'E':
+				$job['Job_icon'] = "s_error.gif";
+			break;
+			case 'F':
+			case 'S':
+			case 'M':
+			case 'm':
+			case 's':
+			case 'j':
+			case 'c':
+			case 'd':
+			case 't':
+			case 'C':
+				$job['Job_icon'] = "waiting.png";
+			break;
+		} // end switch
 		
 		// Odd or even row
 		if( count($last_jobs) % 2)
 			$job['Job_classe'] = 'odd';
 		
-		// Elapsed time for this job
-		$job['elapsed_time'] = $dbSql->Get_ElapsedTime( strtotime($job['StartTime']), strtotime($job['EndTime']) );
+		// Elapsed time for the job
+		if( $job['StartTime'] == '0000-00-00 00:00:00' )
+			$job['elapsed_time'] = 'N/A';
+		elseif( $job['EndTime'] == '0000-00-00 00:00:00' )
+			$job['elapsed_time'] = $dbSql->Get_ElapsedTime( strtotime($job['StartTime']), mktime() );
+		else
+			$job['elapsed_time'] = $dbSql->Get_ElapsedTime( strtotime($job['StartTime']), strtotime($job['EndTime']) );
 
-		// Job Status
-                $job['Level'] = $job_status[ $job['Level'] ];
+		// Job Level
+        $job['Level'] = $job_level[ $job['Level'] ];
+		
+		// Job Size
+		$job['JobBytes'] = $dbSql->human_file_size( $job['JobBytes'] );
 
 		array_push( $last_jobs, $job);
 	  }
   }
   $smarty->assign( 'last_jobs', $last_jobs );
   
+  // Count jobs
   if( isset( $_POST['status'] ) )
 	$total_jobs = $dbSql->CountJobs( ALL, $_POST['status'] );
   else