From 4207858a14bdad288a1eb5bbdb2f339dbfc42e08 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed, 18 Aug 2021 14:08:35 -0500
Subject: [PATCH 1/2] Fix the count in
 StatuslabelsController@getAssetsCountByStatuslabel() function that allows it
 to pass the correct index

Also edit the default color for assets with the Pending label, so it match the color in the docs
---
 app/Helpers/Helper.php                              | 2 +-
 app/Http/Controllers/Api/StatuslabelsController.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index cd712c46ee..0cba900920 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -67,7 +67,7 @@ class Helper
     {
         $colors = [
             "#008941",
-            "#FF4A46",
+            "#FF851B",
             "#006FA6",
             "#A30059",
             "#1CE6FF",
diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php
index 774fb70014..8d4b29a227 100644
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -182,6 +182,7 @@ class StatuslabelsController extends Controller
 
                 if ($statuslabel->color!='') {
                     $colors_array[] = $statuslabel->color;
+                    $default_color_count++;
                 } else {
                     $colors_array[] = Helper::defaultChartColors($default_color_count);
                     $default_color_count++;

From f04e23cacb0c5508caa39230e26a663901e9ab2f Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed, 18 Aug 2021 15:22:53 -0500
Subject: [PATCH 2/2] Add a small refactor so we not repeat logic

---
 app/Http/Controllers/Api/StatuslabelsController.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php
index 8d4b29a227..464ac5d77a 100644
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -176,17 +176,15 @@ class StatuslabelsController extends Controller
 
         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_array[] = $statuslabel->color;
-                    $default_color_count++;
                 } else {
                     $colors_array[] = Helper::defaultChartColors($default_color_count);
-                    $default_color_count++;
                 }
+                $default_color_count++;
             }
         }