]> git.sur5r.net Git - bacula/bacula/blobdiff - gui/bacula-web/index.php
bacula-web: Add last used volumes to main dashboard
[bacula/bacula] / gui / bacula-web / index.php
index ac5d90cf377bd89a328aab49dfde03719a2bfaac..2ff9bbf832f5675432043e4cb1058bf0eec489cc 100644 (file)
@@ -95,69 +95,21 @@ $smarty->assign( 'total_name_jobs', $dbSql->Get_BackupJob_Names() );
 // Get volumes list (volumes.tpl)
 $smarty->assign('pools', $dbSql->GetVolumeList() );
 
-// Last 24 hours completed jobs number (last_run_report.tpl)
-$completed_jobs = $dbSql->GetLastJobs();
-$smarty->assign( 'completed_jobs', $completed_jobs['completed_jobs'] );
+// Last 24 hours completed jobs number
+$smarty->assign( 'completed_jobs', $dbSql->CountJobs( LAST_DAY, 'completed' ) );
 
-// Last 24 hours failed jobs number (last_run_report.tpl)
-$failed_jobs = $dbSql->GetLastErrorJobs();
-$smarty->assign( 'failed_jobs', $failed_jobs['failed_jobs'] );
+// Last 24 hours failed jobs number
+$smarty->assign( 'failed_jobs', $dbSql->CountJobs( LAST_DAY, 'failed' ) );
 
-// Last 24 hours elapsed time (last_run_report.tpl)
-$smarty->assign( 'elapsed_jobs', $dbSql->Get_ElapsedTime_Job() );
+// Last 24 hours waiting jobs number
+$smarty->assign( 'waiting_jobs', $dbSql->CountJobs( LAST_DAY, 'waiting' ) );
 
-// last_run_report.tpl
-if ( $mode == "Lite" && $_GET['Full_popup'] == "yes" ) {
-/*
-        // Total Elapsed Time. Only for single Job.
-        if ( $dbSql->driver == "mysql" )
-          $ret = $dbSql->db_link->query("select UNIX_TIMESTAMP(EndTime)-UNIX_TIMESTAMP(StartTime) as elapsed from Job where EndTime <= NOW() and UNIX_TIMESTAMP(EndTime) > UNIX_TIMESTAMP(NOW())-84600")
-                or die ("Error at row 110");
-        if ( $dbSql->driver == "pgsql" )
-          $ret = $dbSql->db_link->query("select EndTime - StartTime as elapsed from Job where EndTime <= NOW() and EndTime > NOW() - 84600 * interval '1 second'")
-                or die ("Error at row 113");
-        while ( $res = $ret->fetchRow() ) {
-                if ( $TotalElapsed < 1000000000 )                                                                               // Temporal "workaround" ;) Fix later
-                        $TotalElapsed += $res[0];
-        }
-        if ($TotalElapsed > 86400)                                                                                                      // More than 1 day!
-                $TotalElapsed = gmstrftime("%d days %H:%M:%S", $TotalElapsed);
-        else
-                $TotalElapsed = gmstrftime("%H:%M:%S", $TotalElapsed);
-        $smarty->assign('TotalElapsed',$TotalElapsed);
-        $ret->free();
-*/             
-               
-}
-else if ($mode == "Full" || $_GET['Full_popup'] == "yes" ){
-/*
-        $tmp1 = array();
-        if ( $dbSql->driver == "mysql")
-                $query = "select SEC_TO_TIME( UNIX_TIMESTAMP(Job.EndTime)-UNIX_TIMESTAMP(Job.StartTime) )
-                                as elapsed,Job.Name,Job.StartTime,Job.EndTime,Job.Level,Pool.Name,Job.JobStatus from Job 
-                                LEFT JOIN Pool ON Job.PoolId=Pool.PoolId where EndTime <= NOW() and UNIX_TIMESTAMP(EndTime) >UNIX_TIMESTAMP(NOW())-86400 
-                                order by elapsed ";                                                                                                     // Full report array
-        if ( $dbSql->driver == "pgsql")
-                $query = "select (Job.EndTime - Job.StartTime )
-                                as elapsed,Job.Name,Job.StartTime,Job.EndTime,Job.Level,Pool.Name,Job.JobStatus from Job
-                                LEFT JOIN Pool ON Job.PoolId=Pool.PoolId where EndTime <= NOW() and EndTime > NOW() - 86400 * interval '1 second'
-                                order by elapsed ";
-        $status = $dbSql->db_link->query($query)
-                or die ("Error: query at row 138");
-        while ( $tmp = $status->fetchRow() ) {
-                $tdate = explode (":",$tmp[0]);
-                if ( $tdate[0] > 300000 )                                                                                               // Temporal "workaround" ;) Fix later
-                        $tmp[0] = "00:00:00";
-                array_push($tmp1,$tmp);
-        }
-        
-        $smarty->assign('clients',$tmp1);
-*/
-}
+// Last 24 hours elapsed time (last_run_report.tpl)
+//$smarty->assign( 'elapsed_jobs', $dbSql->Get_ElapsedTime_Job() );
 
 // Last 24 hours Job status graph
 $data   = array();  
-$status = array( 'completed', 'completed_errors', 'failed', 'waiting', 'created', 'running', 'error' );
+$status = array( 'completed', 'terminated_errors', 'failed', 'waiting', 'created', 'running', 'error' );
 
 foreach( $status as $job_status ) {
        array_push( $data, $dbSql->GetJobsStatistics( $job_status ) );
@@ -165,9 +117,7 @@ foreach( $status as $job_status ) {
 
 $graph = new BGraph( "graph.png" );
 $graph->SetData( $data, 'pie', 'text-data-single' );
-//$graph->SetTitle("Overall jobs status");
 $graph->SetGraphSize( 400, 230 );
-//$graph->SetColors( array('green', 'yellow','red','blue','white','green','red') );
 
 $graph->Render();
 $smarty->assign('graph_jobs', $graph->Get_Image_file() );
@@ -196,7 +146,7 @@ $days  = array();
 
 // Get the last 7 days interval (start and end)
 for( $c = 6 ; $c >= 0 ; $c-- ) {
-       $today = ( mktime() - ($c * 86400) );
+       $today = ( mktime() - ($c * LAST_DAY) );
        array_push( $days, array( 'start' => date( "Y-m-d 00:00:00", $today ), 'end' => date( "Y-m-d 23:59:00", $today ) ) );
 }
 
@@ -212,8 +162,29 @@ $graph->SetGraphSize( 400, 230 );
 $graph->Render();
 $smarty->assign('graph_stored_bytes', $graph->Get_Image_file() );
 
-if ($_GET['Full_popup'] == "yes" || $_GET['pop_graph1'] == "yes" || $_GET['pop_graph2'] == "yes")
-        $smarty->display('full_popup.tpl');
-else
-        $smarty->display('index.tpl');
+// Last 15 used volumes
+$vol_list = array();
+
+$query  = "SELECT DISTINCT Media.Volumename, Media.VolStatus, Job.JobId FROM Job ";
+$query .= "LEFT JOIN JobMedia ON Job.JobId = JobMedia.JobId ";
+$query .= "LEFT JOIN Media ON JobMedia.MediaId = Media.MediaId ";
+$query .= "ORDER BY Job.JobId DESC ";
+$query .= "LIMIT 15 ";
+
+$result = $dbSql->db_link->query( $query );
+
+if ( PEAR::isError( $result ) )
+       die( "Unable to get last used volumes from catalog \n " . $result->getMessage() );
+else {
+       while ( $vol = $result->fetchRow( DB_FETCHMODE_ASSOC ) ) 
+               array_push( $vol_list, $vol );
+}
+$smarty->assign( 'volume_list', $vol_list );   
+
+//if ($_GET['Full_popup'] == "yes" || $_GET['pop_graph1'] == "yes" || $_GET['pop_graph2'] == "yes")
+//        $smarty->display('full_popup.tpl');
+//else
+
+// Render template
+$smarty->display('index.tpl');
 ?>