TMSS-717: getSubTasksStartingInThreeMinutes includes subtasks in scheduled and queueing state

MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc

@@ -87,7 +87,16 @@ Json::Value TMSSBridge::getSubTasksStartingInThreeMinutes()
 
     Json::Value result;
     if(httpGETAsJson(queryStr, result))
-        return result["results"];
+        result = result["results"];
+
+        // combine scheduled list with queuing list
+        string queryStr2 = "/api/subtask/?state__value=queueing&start_time__gt=" + to_iso_extended_string(lower_limit) + "&start_time__lt=" + to_iso_extended_string(upper_limit) + "&ordering=start_time";
+        Json::Value result2;
+        if(httpGETAsJson(queryStr2, result2))
+            result2 = result2["results"];
+            result = result.append(result2)
+
+        return result;
     return Json::Value("");
 }