DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed [ch945] - Status colors are not displaying correctly in the chart on the dashboard

Browse source
This commit is contained in:
snipe 2020-11-10 00:54:39 -08:00
parent 895a544d4c
commit 044dfe2620
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/Api/StatuslabelsController.php
View file

@ -171,20 +171,26 @@ class StatuslabelsController extends Controller
$labels=[];
$points=[];
$colors=[];
$default_color = Helper::chartColors();
$default_color_count = 0;
foreach ($statuslabels as $statuslabel) {
if ($statuslabel->assets_count > 0) {
$labels[]=$statuslabel->name. ' ('.number_format($statuslabel->assets_count).')';
$points[]=$statuslabel->assets_count;
if ($statuslabel->color!='') {
$colors[]=$statuslabel->color;
$colors_array[] = $statuslabel->color;
} else {
$colors_array[] = $default_color[$default_color_count];
$default_color_count++;
}
}
}
$colors_array = array_merge($colors, Helper::chartColors());
$colors_array = array_merge($colors_array, Helper::chartColors());
$result= [
"labels" => $labels,