DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Dashbpoard pie fixes

Browse source
This commit is contained in:
snipe 2017-11-01 13:27:59 -07:00
parent 4cdcbc97ee
commit d36e8cfbd2
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,19 +161,22 @@ class StatuslabelsController extends Controller
public function getAssetCountByStatuslabel() public function getAssetCountByStatuslabel()
{ {
$statusLabels = Statuslabel::get(); $statuslabels = Statuslabel::with('assets')->groupBy('id')->withCount('assets')->get();
$labels=[]; $labels=[];
$points=[]; $points=[];
$colors=[]; $colors=[];
foreach ($statusLabels as $statusLabel) { foreach ($statuslabels as $statuslabel) {
if ($statusLabel->assets()->count() > 0) { if ($statuslabel->assets_count > 0) {
$labels[]=$statusLabel->name;
$points[]=$statusLabel->assets()->whereNull('assigned_to')->count(); $labels[]=$statuslabel->name. ' ('.number_format($statuslabel->assets_count).')';
if ($statusLabel->color!='') { $points[]=$statuslabel->assets_count;
$colors[]=$statusLabel->color; if ($statuslabel->color!='') {
$colors[]=$statuslabel->color;
} }
} }
} }
$colors_array = array_merge($colors, Helper::chartColors()); $colors_array = array_merge($colors, Helper::chartColors());