tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

#11126 added datatable

Browse Source
This commit is contained in:
Daniel Cebrian 2023-10-16 16:45:03 +02:00
parent 533201197a
commit 4c14a5ee16
4 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extras/mr/66.sql
View File

@ -211,7 +211,7 @@ ALTER TABLE `tagente` ADD COLUMN `vul_scan_interval` INT NOT NULL DEFAULT 300;
CREATE TABLE IF NOT EXISTS `pandora_cve` ( CREATE TABLE IF NOT EXISTS `pandora_cve` (
`cve_id` VARCHAR(20), `cve_id` VARCHAR(20),
`cvss_score` DECIMAL(5, 2), `cvss_score` DECIMAL(5, 2),
`cvss_vector` VARCHAR(50), `cvss_vector` VARCHAR(255),
PRIMARY KEY (`cve_id`) PRIMARY KEY (`cve_id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;

33
pandora_console/include/graphs/fgraph.php
View File

@ -1237,20 +1237,35 @@ function get_build_setup_charts($type, $options, $data)
break; break;
case 'BAR': case 'BAR':
$setData->setLabel('data')->setBackgroundColor($colors); if (isset($options['multiple']) === true && empty($options['multiple']) === false) {
$setData->setLabel('data')->setBorderColor($borders); $i = 0;
$setData->setLabel('data')->setBorderWidth(2); foreach ($options['multiple'] as $key_label => $label) {
$dataSet = $chart->createDataSet();
if ($chart->options()->getScales()->getX()->isStacked() === true) { $dataSet->setLabel($label);
$dataSet->setBackgroundColor($colors[$i]);
$dataSet->setBorderColor($borders[$i]);
$dataSet->setBorderWidth(2);
$dataSet->data()->exchangeArray(array_values($data[$key_label]));
$chart->addDataSet($dataSet);
$i++;
}
} else if ($chart->options()->getScales()->getX()->isStacked() === true) {
$i = 0;
foreach ($data as $key => $dataset) { foreach ($data as $key => $dataset) {
$dataSet1 = $chart->createDataSet(); $dataSet1 = $chart->createDataSet();
$dataSet1->setBackgroundColor($dataset['backgroundColor']); $dataSet1->setBackgroundColor($colors[$i]);
$dataSet1->setBorderColor($borders[$i]);
$dataSet1->setLabel($dataset['label']); $dataSet1->setLabel($dataset['label']);
$dataSet1->setBorderWidth(2);
$dataSet1->data()->exchangeArray($dataset['data']); $dataSet1->data()->exchangeArray($dataset['data']);
$dataSet1->setStack($dataset['stack']); $dataSet1->setStack($dataset['stack']);
$chart->addDataSet($dataSet1); $chart->addDataSet($dataSet1);
$i++;
} }
} else { } else {
$setData->setLabel('data')->setBackgroundColor($colors);
$setData->setLabel('data')->setBorderColor($borders);
$setData->setLabel('data')->setBorderWidth(2);
$setData->setLabel('data')->data()->exchangeArray(array_values($data)); $setData->setLabel('data')->data()->exchangeArray(array_values($data));
} }
@ -1300,7 +1315,11 @@ function get_build_setup_charts($type, $options, $data)
break; break;
} }
if ($type !== 'RADAR' && $type !== 'LINE' && $stacked !== true) { if ($type !== 'RADAR'
&& $type !== 'LINE'
&& $stacked === false
&& (isset($options['multiple']) === false || empty($options['multiple']) === true)
) {
$chart->addDataSet($setData); $chart->addDataSet($setData);
} }

19
pandora_console/include/styles/vulnerabilities.css
View File

@ -70,12 +70,17 @@
margin-bottom: 45px; margin-bottom: 45px;
} }
#reach-metrics .row-graphs {
max-width: 100%;
}
#score-bar { #score-bar {
max-width: 85%; max-width: 85%;
margin: 0 auto; margin: 0 auto;
} }
#bar { #bar {
height: 100%; height: 100%;
animation: load 2s;
} }
.marks { .marks {
color: #9f9f9f; color: #9f9f9f;
@ -111,7 +116,10 @@
color: #0000008c; color: #0000008c;
margin-left: 13px; margin-left: 13px;
} }
.dt-buttons {
display: flex;
margin: 10px;
}
#content-bar { #content-bar {
border: 1px solid #d7d7d7; border: 1px solid #d7d7d7;
width: 100%; width: 100%;
@ -136,3 +144,12 @@
width: 80%; width: 80%;
} }
} }
@keyframes load {
from {
width: 0%;
}
to {
width: 100%;
}
}

2
pandora_console/pandoradb.sql
View File

@ -4422,6 +4422,6 @@ PRIMARY KEY (`id`)
CREATE TABLE IF NOT EXISTS `pandora_cve` ( CREATE TABLE IF NOT EXISTS `pandora_cve` (
`cve_id` VARCHAR(20), `cve_id` VARCHAR(20),
`cvss_score` DECIMAL(5, 2), `cvss_score` DECIMAL(5, 2),
`cvss_vector` VARCHAR(50), `cvss_vector` VARCHAR(255),
PRIMARY KEY (`cve_id`) PRIMARY KEY (`cve_id`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;