From: Davide Franco <bacula-dev@dflc.ch>
Date: Wed, 12 Jan 2011 14:04:14 +0000 (+0100)
Subject: bacula-web: More explicit Job level description in jobs report
X-Git-Tag: Release-5.2.1~560
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=61c02072e82a18551d12776cdb6446af4ff26255;p=bacula%2Fbacula

bacula-web: More explicit Job level description in jobs report

 - Modified php code in jobs.php (Full instead of F, Diff instead of D and Incr instead of I)
---

diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php
index 931020229d..fba9becf79 100644
--- a/gui/bacula-web/jobs.php
+++ b/gui/bacula-web/jobs.php
@@ -19,6 +19,9 @@
   $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();
   
@@ -37,20 +40,8 @@
   }else {
 	  while( $job = $jobsresult->fetchRow( DB_FETCHMODE_ASSOC ) ) {
 	
-		$elapsed = 'N/A';
-		
-		/*
-		if( $job['JobStatus'] == 'R') {
-			$elapsed = mktime() - strtotime($job['StartTime']);
-			if( $elapsed > 3600 )
-				$elapsed = date( "H:i:s", $elapsed );
-			elseif( $elapsed > 86400 )
-				$elapsed = date( "d day(s) i:s", $elapsed );
-			else
-				$elapsed = date( "i:s", $elapsed );
-		}
-		*/
 		// Elapsed time for this job
+		$elapsed = 'N/A';
 		if( $job['JobStatus'] == 'R' )
 			$job['elapsed_time'] = $dbSql->Get_ElapsedTime( strtotime($job['StartTime']), time() );
 		else
@@ -59,6 +50,9 @@
 		// Odd or even row
 		if( count($running_jobs) % 2)
 			$job['Job_classe'] = 'odd';
+
+		// Job Status
+		$job['Level'] = $job_status[ $job['Level'] ];
 		
 		array_push( $running_jobs, $job);
 	  }
@@ -118,6 +112,10 @@
 		
 		// Elapsed time for this job
 		$job['elapsed_time'] = $dbSql->Get_ElapsedTime( strtotime($job['StartTime']), strtotime($job['EndTime']) );
+
+		// Job Status
+                $job['Level'] = $job_status[ $job['Level'] ];
+
 		array_push( $last_jobs, $job);
 	  }
   }