Merge pull request #48 from fbergkemper/master

written bytes fixed
bareos · Sep 9, 2014 · 275e180 · 275e180
2 parents 89f7fae + 509e2b0
commit 275e180
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/module/Application/src/Application/View/Helper/Bytes.php b/module/Application/src/Application/View/Helper/Bytes.php
@@ -33,27 +33,27 @@
 class Bytes extends AbstractHelper
 {
 
-    protected $mb;
+	protected $bsize;
 
-    /**
-     * @method 
-     * @return string 
-     */
-    public function __invoke($bytes)
-    {
+	/**
+     	 * @method 
+     	 * @return string 
+     	 */
+    	public function __invoke($bytes)
+    	{
 
-	$units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB');
-    	$this->b = "0.00 B";
+		$units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB');
+		$this->bsize = "0.00 B";
 
-    	if($bytes > 0)
-    	{
-        	$result = log($bytes) / log(1024);
-        	$this->b = round(pow(1024, $result - ($tmp = floor($result))), 2)." ".$units[$tmp];
-    	}
+		if($bytes > 0)
+		{
+			$result = log($bytes) / log(1000);
+			$this->bsize = round(pow(1000, $result - ($tmp = floor($result))), 2)." ".$units[$tmp];
+		}
 
-	return $this->b;
+		return $this->bsize;
 
-    }
+    	}
 
 }
 
diff --git a/module/Job/src/Job/Model/JobTable.php b/module/Job/src/Job/Model/JobTable.php
@@ -244,6 +244,7 @@ public function getLast24HoursSuccessfulJobs($paginated=false, $order_by=null, $
                                 $bsqlch->strdbcompat("Level"),
                                 $bsqlch->strdbcompat("StartTime"),                                              
                                 $bsqlch->strdbcompat("EndTime"),
+				$bsqlch->strdbcompat("JobBytes"),
                                 $bsqlch->strdbcompat("JobStatus"),                                              
                                 'duration' => $duration,
                         )