Resolved blocked service UI bug (#134)

gaseous-server/Timer.cs

@@ -36,7 +36,7 @@ namespace gaseous_server
             List<ProcessQueue.QueueItem> ActiveList = new List<ProcessQueue.QueueItem>();
             ActiveList.AddRange(ProcessQueue.QueueItems);
             foreach (ProcessQueue.QueueItem qi in ActiveList) {
-                if (CheckProcessBlockList(qi) == true) {
+                if (CheckIfProcessIsBlockedByOthers(qi) == false) {
                     qi.BlockedState(false);
                     if (DateTime.UtcNow > qi.NextRunTime || qi.Force == true)
                     {
@@ -69,31 +69,25 @@ namespace gaseous_server
             _timer?.Dispose();
         }
 
-        private bool CheckProcessBlockList(ProcessQueue.QueueItem queueItem)
+        private bool CheckIfProcessIsBlockedByOthers(ProcessQueue.QueueItem queueItem)
-        {
-            if (queueItem.Blocks.Count > 0)
         {
             foreach (ProcessQueue.QueueItem qi in ProcessQueue.QueueItems)
             {
+                if (qi.ItemState == ProcessQueue.QueueItemState.Running) {
+                    // other service is running, check if queueItem is blocked by it
                     if (
-                        (
+                        qi.Blocks.Contains(queueItem.ItemType) ||
-                            queueItem.Blocks.Contains(qi.ItemType) || 
+                        qi.Blocks.Contains(ProcessQueue.QueueItemType.All)
-                            queueItem.Blocks.Contains(ProcessQueue.QueueItemType.All)
-                        ) &&
-                            qi.ItemState == ProcessQueue.QueueItemState.Running
                     )
                     {
+                        Console.WriteLine(queueItem.ItemType.ToString() + " is blocked by " + qi.ItemType.ToString());
+                        return true;
+                    }
+                }
+            }
+
             return false;
         }
     }
-
-                return true;
-            }
-            else
-            {
-                return true;
-            }
-        }
-    }
 }
 

gaseous-server/wwwroot/pages/settings/system.html

@@ -64,7 +64,7 @@
 
                     var itemStateName;
                     var itemLastStart;
-                    if (result[i].IsBlocked == false) {
+                    if (result[i].isBlocked == false) {
                         switch (result[i].itemState) {
                             case 'NeverStarted':
                                 itemStateName = "Never started";