kritbit Commit Details

Date:

2015-12-18 23:10:28 (9 years 10 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

2ee3e7cee5236f95155d426fa567f3922de34b03

Parents:

279452a992133e80a80329d34961d7c6b34a3ca1

Message:

Adding dygraph support

Changes:

File differences

-39
40 40
41 41
42 
43 42
44 43
45 44
46 45
47 
46
47
48
49
50
51
48 52
49 53
50 54
+␉    try {␊
␉␉    if (count($idArr) == 2) {␊
␉␉␉    /** @var \application\models\Histories $historyArr */␊
␉␉␉    //$historyArr = \application\models\Histories::getByField("jobs_id", $idArr[1]);␊
␉␉␉    $historyArr = DB::fetchObject("SELECT * FROM histories WHERE jobs_id = ? ORDER BY run_date DESC", '\application\models\Histories', [$idArr[1]]);␊
␉␉␉    /** @var \application\models\Jobs[] $jobObject */␊
␉␉␉    $jobObject = \application\models\Jobs::getByField("id", $idArr[1]);␊
␉␉␉    if ($this->checkAccess($jobObject[0])) {␊
␉␉␉␉    echo $this->loadRender("history.html", ["job" => $jobObject[0], "histories" => $historyArr]);␊
␉␉␉␉    $csv = [];␊
␉␉␉␉    /** @var \application\models\histories $history */␊
␉␉␉␉    foreach($historyArr as $history) {␊
␉␉␉␉␉    $csv[] = "\"" . str_replace("-", "/", $history->run_date) . "," . $history->time_taken . "," . $history->getRawSize() . "," . $history->result . "\\n\"";␊
␉␉␉␉    }␊
␉␉␉␉    echo $this->loadRender("history.html", ["csv" => implode("+", $csv), "job" => $jobObject[0], "histories" => $historyArr]);␊
␉␉␉    }␊
␉␉    }␊
␉    } catch (\Exception $e) {␊
 ␉    try {␊
 ␉␉    if (count($idArr) == 2) {␊
 ␉␉␉    /** @var \application\models\Histories $historyArr */␊
-␉␉␉    //$historyArr = \application\models\Histories::getByField("jobs_id", $idArr[1]);␊
 ␉␉␉    $historyArr = DB::fetchObject("SELECT * FROM histories WHERE jobs_id = ? ORDER BY run_date DESC", '\application\models\Histories', [$idArr[1]]);␊
 ␉␉␉    /** @var \application\models\Jobs[] $jobObject */␊
 ␉␉␉    $jobObject = \application\models\Jobs::getByField("id", $idArr[1]);␊
 ␉␉␉    if ($this->checkAccess($jobObject[0])) {␊
-␉␉␉␉    echo $this->loadRender("history.html", ["job" => $jobObject[0], "histories" => $historyArr]);␊
+␉␉␉␉    $csv = [];␊
+␉␉␉␉    /** @var \application\models\histories $history */␊
+␉␉␉␉    foreach($historyArr as $history) {␊
+␉␉␉␉␉    $csv[] = "\"" . str_replace("-", "/", $history->run_date) . "," . $history->time_taken . "," . $history->getRawSize() . "," . $history->result . "\\n\"";␊
+␉␉␉␉    }␊
+␉␉␉␉    echo $this->loadRender("history.html", ["csv" => implode("+", $csv), "job" => $jobObject[0], "histories" => $historyArr]);␊
 ␉␉␉    }␊
 ␉␉    }␊
 ␉    } catch (\Exception $e) {␊

-36
37 37
38 38
39 
39
40 40
41 41
42
43
44
45
42 46
+␉    return round($bytes, $precision) . ' ' . $units[$pow];␊
␉}␊
␊
public function getSize() {␊
␉public function getSize() {␊
␉␉return $this->formatBytes(strlen($this->output));␊
␉}␊
␊
␉public function getRawSize() {␊
␉␉return strlen($this->output);␊
␉}␊
}
 ␉    return round($bytes, $precision) . ' ' . $units[$pow];␊
 ␉}␊
 ␊
-public function getSize() {␊
+␉public function getSize() {␊
 ␉␉return $this->formatBytes(strlen($this->output));␊
 ␉}␊
+␊
+␉public function getRawSize() {␊
+␉␉return strlen($this->output);␊
+␉}␊
 }

Download the corresponding diff file

kritbit

File differences

Branches