ebl Tweak stats page

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7205 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/lang/en/tpl/display_stats.tpl b/gui/bweb/lang/en/tpl/display_stats.tpl
index b6cdd435044fc1731feb80bdb75b429d9e636499..67eeac0e71eb7c2f67df3cd1f583c604a38e8d2c 100644 (file)
--- a/gui/bweb/lang/en/tpl/display_stats.tpl
+++ b/gui/bweb/lang/en/tpl/display_stats.tpl
@@ -8,18 +8,26 @@
  </div>
 
 <script type="text/javascript" language="JavaScript">
-var header = new Array("Name", "Nb Jobs", "Nb Bytes", "Nb Bytes", "Nb Files", "Nb Resto");
+var header = new Array("Name", "Nb Jobs", "Nb Err", "% Ok", ,  "Nb Resto", 
+                       "Nb Bytes", "Nb Bytes", "Nb Files");
 
 var data = new Array();
 
 <TMPL_LOOP stats>
+
+var nb_job=<TMPL_IF nb_job><TMPL_VAR nb_job><TMPL_ELSE>0</TMPL_IF>;
+var nb_err=<TMPL_IF nb_err><TMPL_VAR nb_err><TMPL_ELSE>0</TMPL_IF>;
+var t_ok = (nb_job - nb_err)/(nb_job + 0.0001)*100;
+
 data.push( 
   new Array( "<TMPL_VAR name>", 
-            "<TMPL_VAR nb_job>",
+            nb_job,
+             nb_err,
+             t_ok.toFixed(2),
+            "<TMPL_VAR nb_resto>",
             human_size(<TMPL_VAR nb_byte>),
             <TMPL_VAR nb_byte>,
-            "<TMPL_VAR nb_file>",
-            "<TMPL_VAR nb_resto>"
+            "<TMPL_VAR nb_file>"
              )
 ) ; 
 </TMPL_LOOP>

diff --git a/gui/bweb/lang/es/tpl/display_stats.tpl b/gui/bweb/lang/es/tpl/display_stats.tpl
index 7f5fa801bdd1500be1883b158db233c9c130f10d..9665dc4a2224967a55aa49f75a49195329a50fc8 100644 (file)
--- a/gui/bweb/lang/es/tpl/display_stats.tpl
+++ b/gui/bweb/lang/es/tpl/display_stats.tpl
@@ -1,6 +1,5 @@
-<br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Estadísticas (<TMPL_VAR label>)</h1>
+  <h1 class='newstitle'> Estadísticas (<TMPL_VAR label>)</h1>
  </div>
  <div class='bodydiv'>
 <form action='?'>
@@ -9,18 +8,26 @@
  </div>
 
 <script type="text/javascript" language="JavaScript">
-var header = new Array("Nombre", "Nb Jobs", "Nb Bytes", "Nb Bytes", "Nb Files", "Nb Resto");
+var header = new Array("Nombre", "Nb Jobs", "Nb Err", "% Ok", ,  "Nb Resto", 
+                       "Nb Bytes", "Nb Bytes", "Nb Files");
 
 var data = new Array();
 
 <TMPL_LOOP stats>
+
+var nb_job=<TMPL_IF nb_job><TMPL_VAR nb_job><TMPL_ELSE>0</TMPL_IF>;
+var nb_err=<TMPL_IF nb_err><TMPL_VAR nb_err><TMPL_ELSE>0</TMPL_IF>;
+var t_ok = (nb_job - nb_err)/(nb_job + 0.0001)*100;
+
 data.push( 
   new Array( "<TMPL_VAR name>", 
-            "<TMPL_VAR nb_job>",
+            nb_job,
+             nb_err,
+             t_ok.toFixed(2),
+            "<TMPL_VAR nb_resto>",
             human_size(<TMPL_VAR nb_byte>),
             <TMPL_VAR nb_byte>,
-            "<TMPL_VAR nb_file>",
-            "<TMPL_VAR nb_resto>"
+            "<TMPL_VAR nb_file>"
              )
 ) ; 
 </TMPL_LOOP>

diff --git a/gui/bweb/lang/fr/tpl/display_stats.tpl b/gui/bweb/lang/fr/tpl/display_stats.tpl
index c0814e29d6c636c4a46fe5d8165e877030f42252..433a6d4c5ef282b27ad68fdeac6e61de6ac13cb0 100644 (file)
--- a/gui/bweb/lang/fr/tpl/display_stats.tpl
+++ b/gui/bweb/lang/fr/tpl/display_stats.tpl
@@ -1,4 +1,3 @@
-<br/>
  <div class='titlediv'>
   <h1 class='newstitle'> Statistiques (<TMPL_VAR label>)</h1>
  </div>
@@ -9,18 +8,26 @@
  </div>
 
 <script type="text/javascript" language="JavaScript">
-var header = new Array("Nom", "Nb Jobs", "Nb Bytes", "Nb Bytes", "Nb Fichiers", "Nb Resto");
+var header = new Array("Nom", "Nb Jobs", "Nb Err", "% Ok", ,  "Nb Resto", 
+                       "Nb Bytes", "Nb Bytes", "Nb Fichiers");
 
 var data = new Array();
 
 <TMPL_LOOP stats>
+
+var nb_job=<TMPL_IF nb_job><TMPL_VAR nb_job><TMPL_ELSE>0</TMPL_IF>;
+var nb_err=<TMPL_IF nb_err><TMPL_VAR nb_err><TMPL_ELSE>0</TMPL_IF>;
+var t_ok = (nb_job - nb_err)/(nb_job + 0.0001)*100;
+
 data.push( 
   new Array( "<TMPL_VAR name>", 
-            "<TMPL_VAR nb_job>",
+            nb_job,
+             nb_err,
+             t_ok.toFixed(2),
+            "<TMPL_VAR nb_resto>",
             human_size(<TMPL_VAR nb_byte>),
             <TMPL_VAR nb_byte>,
-            "<TMPL_VAR nb_file>",
-            "<TMPL_VAR nb_resto>"
+            "<TMPL_VAR nb_file>"
              )
 ) ; 
 </TMPL_LOOP>

diff --git a/gui/bweb/tpl/display_stats.tpl b/gui/bweb/tpl/display_stats.tpl
index 9db53be64c5b1e63cf46402427b7b1c33fa8eede..a4446a30f1b1162ee9583ff66ee0ddc9a2bac746 100644 (file)
--- a/gui/bweb/tpl/display_stats.tpl
+++ b/gui/bweb/tpl/display_stats.tpl
@@ -8,7 +8,7 @@
  </div>
 
 <script type="text/javascript" language="JavaScript">
-var header = new Array("__Name__", "__Nb Jobs__", "__Nb Err__", "__Ok Rate__", ,  "__Nb Resto__", 
+var header = new Array("__Name__", "__Nb Jobs__", "__Nb Err__", "__% Ok__", ,  "__Nb Resto__", 
                        "__Nb Bytes__", "__Nb Bytes__", "__Nb Files__");
 
 var data = new Array();
@@ -17,7 +17,7 @@ var data = new Array();
 
 var nb_job=<TMPL_IF nb_job><TMPL_VAR nb_job><TMPL_ELSE>0</TMPL_IF>;
 var nb_err=<TMPL_IF nb_err><TMPL_VAR nb_err><TMPL_ELSE>0</TMPL_IF>;
-var t_ok = (nb_job - nb_err)/(nb_job + 0.0001);
+var t_ok = (nb_job - nb_err)/(nb_job + 0.0001)*100;
 
 data.push( 
   new Array( "<TMPL_VAR name>",