ryan/sagacity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to fix #52.

Browse Source
This commit is contained in:
Ryan Prather 2018-10-13 20:07:56 -04:00
parent c0b54abe09
commit 13456fed63
3 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Database_Baseline.zip
View File

Binary file not shown.

73
inc/database.inc
View File

@ -9850,65 +9850,40 @@ class db
*/ */
public function get_Cat_Count(ste_cat &$cat) public function get_Cat_Count(ste_cat &$cat)
{ {
$op = (empty($cat->get_ID()) ? IS : '='); $where = [];
$value = ($op == IS ? null : $cat->get_ID()); if($cat->get_ID()) {
$this->help->select("get_pdi_count", ["SUM(`pdi_count`) AS 'total'"], [ $where[] = [
[
'field' => 'cat_id', 'field' => 'cat_id',
'op' => $op, 'value' => $cat->get_ID()
'value' => $value ];
]
]);
$rows = $this->help->execute();
if (is_array($rows) && isset($rows['total'])) {
$cat->total = $rows['total'];
$cat->nr = $rows['total'];
} }
else { else {
$cat->total = 0; $where[] = [
'field' => 'ste_id',
'value' => $cat->get_STE_ID()
];
} }
$this->help->select("target", ['cat_1', 'cat_2', 'cat_3', 'closed', 'not_applicable', 'not_reviewed'], $where);
$this->help->select("get_finding_count", ['status', "SUM(`finding_count`) AS 'finding_count'"], [
[
'field' => 'cat_id',
'op' => $op,
'value' => $value
]
], [
'group' => 'status'
]);
$rows = $this->help->execute(); $rows = $this->help->execute();
if(is_array($rows) && count($rows) && isset($rows['cat_1'])) {
if (is_array($rows) && count($rows) && isset($rows['status'])) { $cat->open += $rows['cat_1'] + $rows['cat_2'] + $rows['cat_3'];
$rows = [0 => $rows]; $cat->na += $rows['not_applicable'];
$cat->nf += $rows['closed'];
$cat->nr += $rows['not_reviewed'];
} }
elseif(is_array($rows) && count($rows) && isset($rows[0])) {
if (is_array($rows) && count($rows) && isset($rows[0])) { foreach($rows as $r) {
foreach ($rows as $row) { $cat->open += $r['cat_1'] + $r['cat_2'] + $r['cat_3'];
$cat->nr -= $row['finding_count']; $cat->na += $r['not_applicable'];
if ($row['status'] == 'Not Reviewed') { $cat->nf += $r['closed'];
$cat->nr += ($row['finding_count'] * 2); // to account for what was just subtracted $cat->nr += $r['not_reviewed'];
}
elseif ($row['status'] == 'Not a Finding' || $row['status'] == 'False Positive') {
$cat->nf += $row['finding_count'];
}
elseif ($row['status'] == 'Open' || $row['status'] == 'Exception') {
$cat->open += $row['finding_count'];
}
elseif ($row['status'] == 'Not Applicable') {
$cat->na += $row['finding_count'];
}
} }
} }
$this->help->select_count("target", [ $cat->total = $cat->open + $cat->na + $cat->nf + $cat->nr;
[
'field' => 'cat_id', $this->help->select_count("target", $where);
'op' => $op,
'value' => $value
]
]);
$cat->tgt_count = $this->help->execute(); $cat->tgt_count = $this->help->execute();
} }

1
ste/stats.php
View File

@ -175,7 +175,6 @@ if ($ste_id) {
} }
include_once "header.inc"; include_once "header.inc";
?> ?>
<script type='text/javascript' src='/ste/ste_script.min.js'></script> <script type='text/javascript' src='/ste/ste_script.min.js'></script>