bacula-web: Internal code improvments

[bacula/bacula] / gui / bacula-web / index.php

diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index f2a5cc171c588dc89290c0e8d898837260a7eb12..93a130edff0c8b44da2857a5eada454b3afc02e8 100644 (file)
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -17,7 +17,7 @@
 session_start();
 require ("paths.php");
 require($smarty_path."Smarty.class.php");
-include "classes.inc.php";
+include "bweb.inc.php";
 
 $smarty = new Smarty();     
 $dbSql = new Bweb();
@@ -128,8 +128,8 @@ $smarty->assign( 'total_name_jobs', $dbSql->Get_BackupJob_Names() );
 $smarty->assign('pools',$dbSql->GetVolumeList() );
 
 // Last 24 hours completed jobs number (last_run_report.tpl)
-$failed_jobs = $dbSql->GetLastJobs();
-$smarty->assign( 'completed_jobs', $failed_jobs['completed_jobs'] );
+$completed_jobs = $dbSql->GetLastJobs();
+$smarty->assign( 'completed_jobs', $completed_jobs['completed_jobs'] );
 
 // Last 24 hours failed jobs number (last_run_report.tpl)
 $failed_jobs = $dbSql->GetLastErrorJobs();
@@ -140,6 +140,7 @@ $smarty->assign( 'elapsed_jobs', $dbSql->Get_ElapsedTime_Job() );
 
 // 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")
@@ -157,10 +158,11 @@ if ( $mode == "Lite" && $_GET['Full_popup'] == "yes" ) {
                 $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) )
@@ -182,8 +184,43 @@ else if ($mode == "Full" || $_GET['Full_popup'] == "yes" ){
         }
         
         $smarty->assign('clients',$tmp1);
-}  
+*/
+}
+
+// Last 24 hours Job status graph
+$data   = array();  
+$status = array( 'completed', 'completed_errors', 'failed', 'waiting', 'created', 'running', 'error' );
+
+foreach( $status as $job_status ) {
+       array_push( $data, $dbSql->GetJobsStatistics( $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() );
+unset($graph);
+
+// Pool and volumes graph
+$data = array();
+$graph = new BGraph( "graph1.png" );
+
+$pools = $dbSql->Get_Pools_List();
+
+foreach( $pools as $pool ) {
+       array_push( $data, $dbSql->GetPoolsStatistics( $pool ) );
+}
+
+$graph->SetData( $data, 'pie', 'text-data-single' );
+$graph->SetGraphSize( 400, 230 );
+
 
+$graph->Render();
+$smarty->assign('graph_pools', $graph->Get_Image_file() );
 
 if ($_GET['Full_popup'] == "yes" || $_GET['pop_graph1'] == "yes" || $_GET['pop_graph2'] == "yes")
         $smarty->display('full_popup.tpl');