diff --git a/application/models/Job.php b/application/models/Job.php index 40156e27..d9d09733 100755 --- a/application/models/Job.php +++ b/application/models/Job.php @@ -746,8 +746,8 @@ function getSelectFilteredJob($date_begin, $time_begin, $date_end, $time_end, $select->joinLeft(array('c' => 'Client'), 'j.ClientId = c.ClientId', array('ClientName' => 'c.Name')); $select->joinLeft(array('p' => 'Pool'), 'j.PoolId = p.PoolId', array('PoolName' => 'p.Name')); $select->joinLeft(array('f' => 'FileSet'), 'j.FileSetId = f.FileSetId', array('FileSet')); - $select->joinLeft(array('sd'=> 'webacula_jobdesc'), 'j.Name = sd.name_job'); - + $select->joinLeft(array('sd'=> 'webacula_jobdesc'), 'j.Name = sd.name_job'); + $select->joinLeft(array('wjs'=> 'webacula_job_size'), 'j.JobId = wjs.JobId', array('FileSize' => 'FileSize')); $select->where( "('" . $date_begin . ' ' . $time_begin . "' <= j.StartTime) AND (j.StartTime <= '" . $date_end . ' ' . $time_end . "')" ); @@ -857,6 +857,7 @@ function getByJobId($jobid) $select->joinLeft(array('p' => 'Pool'), 'j.PoolId = p.PoolId', array('PoolName' => 'Name')); $select->joinLeft(array('f' => 'FileSet'), 'j.FileSetId = f.FileSetId', array('FileSet')); $select->joinLeft(array('sd'=> 'webacula_jobdesc'), 'j.Name = sd.name_job'); + $select->joinLeft(array('wjs'=> 'webacula_job_size'), 'j.JobId = wjs.JobId', array('FileSize' => 'FileSize')); $select->where("j.JobId = '$jobid'"); $select->order(array("StartTime", "JobId")); //$sql = $select->__toString(); echo "
$sql
"; exit; // for !!!debug!!! @@ -917,6 +918,7 @@ function getByJobName($jobname) $select->joinLeft(array('p' => 'Pool'), 'j.PoolId = p.PoolId', array('PoolName' => 'Name')); $select->joinLeft(array('f' => 'FileSet'), 'j.FileSetId = f.FileSetId', array('FileSet')); $select->joinLeft(array('sd'=> 'webacula_jobdesc'), 'j.Name = sd.name_job'); + $select->joinLeft(array('wjs'=> 'webacula_job_size'), 'j.JobId = wjs.JobId', array('FileSize' => 'FileSize')); $select->where("j.Name = '$jobname'"); $select->order(array("StartTime desc", "JobId desc")); //$sql = $select->__toString(); echo "
$sql
"; exit; // for !!!debug!!! @@ -974,6 +976,7 @@ function getByVolumeName($volname) $select->joinLeft(array('o' => 'JobMedia'), 'j.JobId = o.JobId', array('JobId')); $select->joinLeft(array('m' => 'Media'), 'm.MediaId = o.MediaId', array('MediaId')); $select->joinLeft(array('sd'=> 'webacula_jobdesc'), 'j.Name = sd.name_job'); + $select->joinLeft(array('wjs'=> 'webacula_job_size'), 'j.JobId = wjs.JobId', array('FileSize' => 'FileSize')); $select->where("m.VolumeName = '$volname'"); $select->order(array("StartTime", "j.JobId")); @@ -1139,6 +1142,7 @@ function getLastJobRun($numjob) $select->joinInner(array('s' => 'Status'), "j.JobStatus = s.JobStatus" , array('jobstatuslong'=>'JobStatusLong')); break; } + $select->joinLeft(array('wjs'=> 'webacula_job_size'), 'j.JobId = wjs.JobId', array('FileSize' => 'FileSize')); $select->where("j.JobStatus IN ('T', 'E', 'e', 'f', 'A', 'W', 'D')"); $select->where("j.Type = 'B'"); $select->order(array("sortStartTime DESC")); @@ -1396,6 +1400,7 @@ function getJobBeforeDate($date_before, $client_id_from, $file_set) " ORDER BY Job.StartTime ASC"; break; } + //echo "
$sql
"; exit; // for !!!debug!!! $stmt = $this->db->query($sql); $ajob_inc = $stmt->fetchAll(); unset($stmt); diff --git a/application/views/scripts/job/find-filters.phtml b/application/views/scripts/job/find-filters.phtml index 3d9bb29f..e97c3907 100755 --- a/application/views/scripts/job/find-filters.phtml +++ b/application/views/scripts/job/find-filters.phtml @@ -13,7 +13,7 @@ ?>
-
+
escape($this->title); ?> @@ -51,7 +51,9 @@ translate->_("Status"); ?> translate->_("Level"); ?> translate->_("Files"); ?> - translate->_("Bytes"); ?> + translate->_("Bytes Stored"); ?> + translate->_("Bytes Copied"); ?> + translate->_("Software Compression"); ?> translate->_("Errors"); ?> translate->_("Client"); ?> translate->_("Pool"); ?> @@ -147,7 +149,7 @@ escape($line['level']);?> ', $this->convBytes($line['jobbytes']), ''; ?> - + + ', $this->convBytes($line['filesize']), ''; + ?> + + ', $this->escape( number_format((1-($jobbytes/$filesize))*100,2) ), ' %'; + } else { + echo '-'; + } + ?> +
- \ No newline at end of file + diff --git a/application/views/scripts/job/terminated-dashboard.phtml b/application/views/scripts/job/terminated-dashboard.phtml index 361c26ce..4879aa4c 100755 --- a/application/views/scripts/job/terminated-dashboard.phtml +++ b/application/views/scripts/job/terminated-dashboard.phtml @@ -37,7 +37,7 @@ translate->_("Level"); ?> translate->_("Files"); ?> translate->_("Bytes"); ?> - translate->_("Errors"); ?> + translate->_("Log"); ?> @@ -152,7 +152,7 @@ -'; + echo ''; else { if ( $line['reviewed'] > 0 ) { // reviewed icon @@ -168,7 +168,7 @@ $this->translate->_("View Messages"), '"'; if ( $line['reviewed'] == 0 ) echo ' class="text-center danger" '; - echo '>', $this->escape($line['joberrors']), ''; + echo '>'; } ?> @@ -193,4 +193,4 @@

- \ No newline at end of file + diff --git a/application/views/scripts/job/terminated.phtml b/application/views/scripts/job/terminated.phtml index e4766e3a..02b53341 100755 --- a/application/views/scripts/job/terminated.phtml +++ b/application/views/scripts/job/terminated.phtml @@ -228,7 +228,9 @@  escape($line['durationtime']);?> - + "> + baseUrl, '/wblogbook/writelogbook/name_job/', $this->escape($line['jobname']), diff --git a/html/images/logviewer-small.png b/html/images/logviewer-small.png new file mode 100755 index 00000000..e608b3c6 Binary files /dev/null and b/html/images/logviewer-small.png differ diff --git a/html/images/logviewer.png b/html/images/logviewer.png index d53785ce..c7b1bcad 100755 Binary files a/html/images/logviewer.png and b/html/images/logviewer.png differ