From f9076b2981f4f25ff62bf367ca007985969a4469 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 22 Sep 2021 19:20:36 +0000
Subject: [PATCH]

---
 server/AyaNova/Controllers/ScheduleController.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/AyaNova/Controllers/ScheduleController.cs b/server/AyaNova/Controllers/ScheduleController.cs
index 43c07fba..1b146a05 100644
--- a/server/AyaNova/Controllers/ScheduleController.cs
+++ b/server/AyaNova/Controllers/ScheduleController.cs
@@ -214,16 +214,20 @@ namespace AyaNova.Api.Controllers
 
         private static string ColorFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
         {
+
             switch (p.WisuColorSource)
             {
+                case PersonalScheduleWorkOrderColorSource.None:
+                    return GRAY_NEUTRAL_HEXA;
                 case PersonalScheduleWorkOrderColorSource.WorkOrderStatus:
-                    return v.WorkOrderStatusColor;
+                    return string.IsNullOrWhiteSpace(v.WorkOrderStatusColor) ? GRAY_NEUTRAL_HEXA : v.WorkOrderStatusColor;
                 case PersonalScheduleWorkOrderColorSource.WorkOrderItemStatus:
-                    return v.WorkOrderItemStatusColor;
+                    return string.IsNullOrWhiteSpace(v.WorkOrderItemStatusColor) ? GRAY_NEUTRAL_HEXA : v.WorkOrderItemStatusColor;
                 case PersonalScheduleWorkOrderColorSource.WorkOrderItemPriority:
-                    return v.WorkOrderItemPriorityColor;
+                    return string.IsNullOrWhiteSpace(v.WorkOrderItemPriorityColor) ? GRAY_NEUTRAL_HEXA : v.WorkOrderItemPriorityColor;
+
             }
-            return string.Empty;
+            return GRAY_NEUTRAL_HEXA;
         }
 
         private static string TextColor(string hexcolor)