From 0791bbdf5015afea020b37d86ec8303a3cfd2d03 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 3 Apr 2008 08:54:12 +0000
Subject: [PATCH] ebl  Tweak progress bar and add Backuped files count to job
 status ebl  Add group stats

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6731 91ce42f0-d328-0410-95d8-f526ca767f89
---
 gui/bweb/cgi/bweb.pl                       | 15 ++++++++++++--
 gui/bweb/lang/en/tpl/client_job_status.tpl |  3 +++
 gui/bweb/lang/en/tpl/display_form_job.tpl  |  8 +++++++-
 gui/bweb/lang/en/tpl/display_stats.tpl     |  1 -
 gui/bweb/lang/es/tpl/client_job_status.tpl |  3 +++
 gui/bweb/lang/es/tpl/display_form_job.tpl  | 21 +++++++++++--------
 gui/bweb/lang/fr/tpl/client_job_status.tpl |  5 ++++-
 gui/bweb/lang/fr/tpl/display_form_job.tpl  | 21 +++++++++++--------
 gui/bweb/lib/Bweb.pm                       | 24 +++++++++++++++++++++-
 gui/bweb/technotes-2.3                     |  3 +++
 gui/bweb/tpl/client_job_status.tpl         |  3 +++
 gui/bweb/tpl/display_form_job.tpl          |  4 +++-
 gui/bweb/tpl/display_stats.tpl             |  1 -
 13 files changed, 88 insertions(+), 24 deletions(-)

diff --git a/gui/bweb/cgi/bweb.pl b/gui/bweb/cgi/bweb.pl
index 1f0eab14e4..a6a14f6c62 100755
--- a/gui/bweb/cgi/bweb.pl
+++ b/gui/bweb/cgi/bweb.pl
@@ -379,10 +379,21 @@ if ($action eq 'begin') {		# main display
 	}
     }
 } elsif ($action eq 'group_stats') {
+    $bweb->can_do('r_view_stat');
+    print "<div><table border='0'><tr><td valign='top'>\n";
+    my $fields = $bweb->get_form(qw/since age 
+                                    db_client_groups qclient_groups/); # drop this to hide 
+    $fields->{action}='group_stats';
+    $fields->{hide_level}=1;
+    $fields->{hide_type}=1;
+    $fields->{hide_status}=1;
+
+    $bweb->display($fields, "display_form_job.tpl");
+
+    print "</td><td valign='top'>";
     $bweb->display_group_stats();
 
-} elsif ($action eq 'group_stats') {
-    $bweb->display_group_stats(age => $arg->{age});
+    print "</td></tr></table></div>"
 
 } elsif ($action eq 'running') {
     $bweb->display_running_jobs(1);
diff --git a/gui/bweb/lang/en/tpl/client_job_status.tpl b/gui/bweb/lang/en/tpl/client_job_status.tpl
index f87a3fa102..e3b6e71af3 100644
--- a/gui/bweb/lang/en/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/en/tpl/client_job_status.tpl
@@ -19,6 +19,9 @@
  <tr>
   <td> <b> Files Examined: </b> </td> <td> <TMPL_VAR "files examined"></td>
  </tr>
+ <tr>
+  <td> <b> Files Backuped: </b> </td> <td> <TMPL_VAR files></td>
+ </tr>
  <tr>
   <td> <b> Bytes: </b> </td> <td> <TMPL_VAR bytes></td>
  </tr>
diff --git a/gui/bweb/lang/en/tpl/display_form_job.tpl b/gui/bweb/lang/en/tpl/display_form_job.tpl
index 21dcf24f0e..f0f11e320b 100644
--- a/gui/bweb/lang/en/tpl/display_form_job.tpl
+++ b/gui/bweb/lang/en/tpl/display_form_job.tpl
@@ -5,6 +5,7 @@
 <div class="otherbox">
 <form name='form1' action='?' method='GET'>
 <table border='0'>
+<TMPL_UNLESS hide_level>
 <tr>
   <td valign='top'>
     <h2>Level</h2>
@@ -16,6 +17,7 @@
     </select>     
   </td>
 </tr>
+</TMPL_UNLESS>
 <TMPL_UNLESS hide_status>
 <tr>
  <td valign='top'>
@@ -47,7 +49,7 @@
 <tr>
   <td valign='top'>
     <h2>Since</h2>
-    <input type='text' id='since' name='since' size='17' title='YYYY-MM-DD'
+    <input type='text' id='since' name='since' size='22' title='YYYY-MM-DD'
      value='<TMPL_VAR since>' class='formulaire'>
   </td>
  </tr>
@@ -55,6 +57,8 @@
   <td valign='top'>
     <h2>Age</h2>
     <select name='age' class='formulaire' onclick='document.getElementById("since").value="";'>
+      <option id='age_86400'   value='86400'>1 day</option>
+      <option id='age_172800'   value='172800'>2 days</option>
       <option id='age_604800'   value='604800'>1 week</option>
       <option id='age_2678400'  value='2678400'>30 days</option>
       <option id='age_15552000' value='15552000'>6 months</option>
@@ -66,6 +70,8 @@
   <td valign='top'>
     <h2>Age</h2>
     <select name='age' class='formulaire'>
+      <option id='age_86400'   value='86400'>Last 24h</option>
+      <option id='age_172800'   value='172800'>This weekend</option>
       <option id='age_604800'   value='604800'>This week</option>
       <option id='age_2678400'  value='2678400'>Last 30 days</option>
       <option id='age_15552000' value='15552000'>Last 6 months</option>
diff --git a/gui/bweb/lang/en/tpl/display_stats.tpl b/gui/bweb/lang/en/tpl/display_stats.tpl
index 2077a31d52..b6cdd43504 100644
--- a/gui/bweb/lang/en/tpl/display_stats.tpl
+++ b/gui/bweb/lang/en/tpl/display_stats.tpl
@@ -1,4 +1,3 @@
-<br/>
  <div class='titlediv'>
   <h1 class='newstitle'> Statistics (<TMPL_VAR label>)</h1>
  </div>
diff --git a/gui/bweb/lang/es/tpl/client_job_status.tpl b/gui/bweb/lang/es/tpl/client_job_status.tpl
index f0739f1374..d8b7f55e76 100644
--- a/gui/bweb/lang/es/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/es/tpl/client_job_status.tpl
@@ -19,6 +19,9 @@
  <tr>
   <td> <b> Archivos Examinados: </b> </td> <td> <TMPL_VAR "files examined"></td>
  </tr>
+ <tr>
+  <td> <b> Files Backuped: </b> </td> <td> <TMPL_VAR files></td>
+ </tr>
  <tr>
   <td> <b> Bytes: </b> </td> <td> <TMPL_VAR bytes></td>
  </tr>
diff --git a/gui/bweb/lang/es/tpl/display_form_job.tpl b/gui/bweb/lang/es/tpl/display_form_job.tpl
index 8d1143a284..1b1ff2619f 100644
--- a/gui/bweb/lang/es/tpl/display_form_job.tpl
+++ b/gui/bweb/lang/es/tpl/display_form_job.tpl
@@ -1,10 +1,10 @@
-<br/>
 <div class="otherboxtitle">
   Filter &nbsp;
 </div>
 <div class="otherbox">
 <form name='form1' action='?' method='GET'>
 <table border='0'>
+<TMPL_UNLESS hide_level>
 <tr>
   <td valign='top'>
     <h2>Nivel</h2>
@@ -16,6 +16,7 @@
     </select>     
   </td>
 </tr>
+</TMPL_UNLESS>
 <TMPL_UNLESS hide_status>
 <tr>
  <td valign='top'>
@@ -47,7 +48,7 @@
 <tr>
   <td valign='top'>
     <h2>Tiempo</h2>
-    <input type='text' id='since' name='since' size='17' title='YYYY-MM-DD'
+    <input type='text' id='since' name='since' size='22' title='YYYY-MM-DD'
      value='<TMPL_VAR since>' class='formulaire'>
   </td>
  </tr>
@@ -55,9 +56,11 @@
   <td valign='top'>
     <h2>Tiempo</h2>
     <select name='age' class='formulaire' onclick='document.getElementById("since").value="";'>
+      <option id='age_86400'   value='86400'>1 day</option>
+      <option id='age_172800'   value='172800'>2 days</option>
       <option id='age_604800'   value='604800'>Esta semana</option>
-      <option id='age_2678400'  value='2678400'>Últimos 30 dias</option>
-      <option id='age_15552000' value='15552000'>Últimos 6 meses</option>
+      <option id='age_2678400'  value='2678400'>Últimos 30 dias</option>
+      <option id='age_15552000' value='15552000'>Últimos 6 meses</option>
     </select>     
   </td>
  </tr>
@@ -66,9 +69,11 @@
   <td valign='top'>
     <h2>Tiempo</h2>
     <select name='age' class='formulaire'>
+      <option id='age_86400'   value='86400'>Last 24h</option>
+      <option id='age_172800'   value='172800'>This weekend</option>
       <option id='age_604800'   value='604800'>Esta Semana</option>
-      <option id='age_2678400'  value='2678400'>Últimos 30 días</option>
-      <option id='age_15552000' value='15552000'>Últimos 6 meses</option>
+      <option id='age_2678400'  value='2678400'>Últimos 30 días</option>
+      <option id='age_15552000' value='15552000'>Últimos 6 meses</option>
     </select>     
   </td>
  </tr>
@@ -87,7 +92,7 @@
 </TMPL_IF>
  <tr>
   <td valign='bottom'> 
-    <h2>Número de items</h2>
+    <h2>Número de items</h2>
     <input type='text' name='limit' value='<TMPL_VAR limit>' 
 	class='formulaire' size='4'>
   </td>
@@ -99,7 +104,7 @@
     <select name='jobtype' class='formulaire'>
       <option id='jobtype_any' value='all type'>Cualquiera</option>
       <option id='jobtype_B' value='B'>Backup</option>
-      <option id='jobtype_R' value='R'>Recuperación</option>
+      <option id='jobtype_R' value='R'>Recuperación</option>
     </select>
   </td>
 </tr>
diff --git a/gui/bweb/lang/fr/tpl/client_job_status.tpl b/gui/bweb/lang/fr/tpl/client_job_status.tpl
index 65c3e334c8..6c4b7b58b4 100644
--- a/gui/bweb/lang/fr/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/fr/tpl/client_job_status.tpl
@@ -19,6 +19,9 @@
  <tr>
   <td> <b> Fichiers vus : </b> </td> <td> <TMPL_VAR "files examined"></td>
  </tr>
+ <tr>
+  <td> <b> Files Backuped: </b> </td> <td> <TMPL_VAR files></td>
+ </tr>
  <tr>
   <td> <b> Taille : </b> </td> <td> <TMPL_VAR bytes></td>
  </tr>
@@ -35,7 +38,7 @@
 </table>
 <form name='form1' action='?' method='GET'>
 <button type="submit" class="bp" name='action' value='dsp_cur_job' 
-> <img src='/bweb/update.png' title='Rafraîchir' alt=''>Rafraîchir</button>
+> <img src='/bweb/update.png' title='Rafraîchir' alt=''>Rafra&icirc;chir</button>
 <input type='hidden' name='client' value='<TMPL_VAR Client>'>
 <input type='hidden' name='jobid' value='<TMPL_VAR JobId>'>
 <button type="submit" class="bp" name='action' value='cancel_job'
diff --git a/gui/bweb/lang/fr/tpl/display_form_job.tpl b/gui/bweb/lang/fr/tpl/display_form_job.tpl
index cf4fdf4c3c..1178807fc9 100644
--- a/gui/bweb/lang/fr/tpl/display_form_job.tpl
+++ b/gui/bweb/lang/fr/tpl/display_form_job.tpl
@@ -1,10 +1,10 @@
-<br/>
 <div class="otherboxtitle">
   Filtre &nbsp;
 </div>
 <div class="otherbox">
 <form name='form1' action='?' method='GET'>
 <table border='0'>
+<TMPL_UNLESS hide_level>
 <tr>
   <td valign='top'>
     <h2>Niveau</h2>
@@ -16,6 +16,7 @@
     </select>     
   </td>
 </tr>
+</TMPL_UNLESS>
 <TMPL_UNLESS hide_status>
 <tr>
  <td valign='top'>
@@ -46,15 +47,17 @@
 <TMPL_UNLESS hide_since>
 <tr>
   <td valign='top'>
-    <h2>Hier</h2>
-    <input type='text' id='since' name='since' size='17' title='YYYY-MM-DD'
+    <h2>Depuis</h2>
+    <input type='text' id='since' name='since' size='22' title='YYYY-MM-DD'
      value='<TMPL_VAR since>' class='formulaire'>
   </td>
  </tr>
 <tr>
   <td valign='top'>
-    <h2>Période</h2>
+    <h2>Période</h2>
     <select name='age' class='formulaire' onclick='document.getElementById("since").value="";'>
+      <option id='age_86400'   value='86400'>1 day</option>
+      <option id='age_172800'   value='172800'>2 days</option>
       <option id='age_604800'   value='604800'>Cette semaine</option>
       <option id='age_2678400'  value='2678400'>30 derniers jours</option>
       <option id='age_15552000' value='15552000'>6 derniers mois</option>
@@ -64,8 +67,10 @@
 <TMPL_ELSE>
 <tr>
   <td valign='top'>
-    <h2>Période</h2>
+    <h2>Période</h2>
     <select name='age' class='formulaire'>
+      <option id='age_86400'   value='86400'>Last 24h</option>
+      <option id='age_172800'   value='172800'>This weekend</option>
       <option id='age_604800'   value='604800'>Cette semaine</option>
       <option id='age_2678400'  value='2678400'>30 derniers jours</option>
       <option id='age_15552000' value='15552000'>Last 6 months</option>
@@ -78,9 +83,9 @@
   <td valign='top'>
     <h2>Time slice</h2>
     <select name='type' class='formulaire'>
-      <option id='slice_day'   value='day'>Per days</option>
-      <option id='slice_week'  value='week'>Per weeks</option>
-      <option id='slice_month' value='month'>Per months</option>
+      <option id='slice_day'   value='day'>Par jour</option>
+      <option id='slice_week'  value='week'>Par semaine</option>
+      <option id='slice_month' value='month'>Par mois</option>
     </select>     
   </td>
  </tr>
diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 0041285033..d72333b357 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -435,7 +435,7 @@ sub display_running_job
 	    $status->{corr_jobfiles} = $infos->{corr_jobfiles};
 	    $status->{jobbytes}=$status->{Bytes}; 
 	    $status->{jobbytes} =~ s![^\d]!!g;
-	    $status->{jobfiles}=$status->{Files}; 
+	    $status->{jobfiles}=$status->{'Files Examined'}; 
 	    $status->{jobfiles} =~ s/,//g;
 	    $bweb->display($status, "client_job_status.tpl");
 	}
@@ -3905,6 +3905,26 @@ SELECT temp.jobname AS jobname,
          + REGR_INTERCEPT(jobbytes,jobtdate)) AS jobbytes,
        COUNT(1) AS nb_jobbytes ";
     }
+    # if it's a differential, we need to compare since the last full
+    # 
+    #   F D D D F D D D      F I I I I D I I I
+    # | #     # #     #    | #         #
+    # | #   # # #   # #    | #         #
+    # | # # # # # # # #    | # # # # # # # # #
+    # +-----------------   +-------------------
+    my $filter2='';
+    if ($level eq 'D') {
+	$filter2 = "
+AND Job.StartTime > (
+ SELECT StartTime 
+   FROM Job 
+  WHERE Job.Name = '$job' 
+    AND Job.Level = 'F' 
+    AND Job.JobStatus = 'T' 
+ORDER BY Job.StartTime DESC LIMIT 1
+) ";
+    }
+    
     $query .= 
 "
 FROM (
@@ -3915,6 +3935,7 @@ FROM (
    WHERE Job.Name = '$job'
      AND Job.Level = '$level'
      AND Job.JobStatus = 'T'
+     $filter2
    ORDER BY StartTime DESC
    LIMIT 4
 ) AS temp GROUP BY temp.jobname
@@ -4014,6 +4035,7 @@ sub display_group_stats
     my ($self) = @_;
     my $arg = $self->get_form('age', 'since');
     return if $self->cant_do('r_view_stat');
+
     my $filter = $self->get_client_group_filter();
 
     my ($limit, $label) = $self->get_limit(%$arg);
diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index 8efc4fbcf0..bc325b1119 100644
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,6 @@
+03Apr08
+ebl  Tweak progress bar and add Backuped files count to job status
+
 02Apr08
 ebl  Add group statistics page
 
diff --git a/gui/bweb/tpl/client_job_status.tpl b/gui/bweb/tpl/client_job_status.tpl
index 0351cd39ae..4a5434e528 100644
--- a/gui/bweb/tpl/client_job_status.tpl
+++ b/gui/bweb/tpl/client_job_status.tpl
@@ -19,6 +19,9 @@
  <tr>
   <td> <b> __Files Examined:__ </b> </td> <td> <TMPL_VAR "files examined"></td>
  </tr>
+ <tr>
+  <td> <b> __Files Backuped:__ </b> </td> <td> <TMPL_VAR files></td>
+ </tr>
  <tr>
   <td> <b> __Bytes:__ </b> </td> <td> <TMPL_VAR bytes></td>
  </tr>
diff --git a/gui/bweb/tpl/display_form_job.tpl b/gui/bweb/tpl/display_form_job.tpl
index 97b2980332..04fb5de18b 100644
--- a/gui/bweb/tpl/display_form_job.tpl
+++ b/gui/bweb/tpl/display_form_job.tpl
@@ -5,6 +5,7 @@
 <div class="otherbox">
 <form name='form1' action='?' method='GET'>
 <table border='0'>
+<TMPL_UNLESS hide_level>
 <tr>
   <td valign='top'>
     <h2>__Level__</h2>
@@ -16,6 +17,7 @@
     </select>     
   </td>
 </tr>
+</TMPL_UNLESS>
 <TMPL_UNLESS hide_status>
 <tr>
  <td valign='top'>
@@ -47,7 +49,7 @@
 <tr>
   <td valign='top'>
     <h2>__Since__</h2>
-    <input type='text' id='since' name='since' size='17' title='YYYY-MM-DD'
+    <input type='text' id='since' name='since' size='22' title='YYYY-MM-DD'
      value='<TMPL_VAR since>' class='formulaire'>
   </td>
  </tr>
diff --git a/gui/bweb/tpl/display_stats.tpl b/gui/bweb/tpl/display_stats.tpl
index 1481bd73ed..74df15817d 100644
--- a/gui/bweb/tpl/display_stats.tpl
+++ b/gui/bweb/tpl/display_stats.tpl
@@ -1,4 +1,3 @@
-<br/>
  <div class='titlediv'>
   <h1 class='newstitle'> __Statistics__ (<TMPL_VAR label>)</h1>
  </div>
-- 
2.39.5