change color cmd_error & try fix error AgentCmd doesn't have attribute 'exists()'

Alexis Koralewski
1 parent 0ddc9733
Showing 2 changed files with 4 additions and 4 deletions Show diff stats
src/core/pyros_django/dashboard/templates/dashboard/agent_detail.html
src/core/pyros_django/dashboard/views.py
@@ -25,7 +25,7 @@
         background-color : lightblue;
     }
     .red{
-        background-color : red;
+        color : red;
     }
     .table{
        width:auto;
@@ -155,13 +155,13 @@
             <tbody>
  
  
-                <tr v-for="command in commands" v-bind:class="['{{agent_name}}' == command.sender ? 'blue' : 'green',['CMD_EXECUTED','CMD_PENDING','CMD_RUNNING'].includes(command.state) ? '' : 'red']" >
+                <tr v-for="command in commands" v-bind:class="'{{agent_name}}' == command.sender ? 'blue' : 'green'" >
                     <td> [[ command.full_name ]] </td>
  
                     <td v-if="command.sender.includes('@') || command.sender == 'System'">[[ command.sender]]</td>
                     <td v-else> <a v-bind:href="`/dashboard/agent_detail/${command.sender}`">[[ command.sender]]</a></td>
                     <td> <a v-bind:href="`/dashboard/agent_detail/${command.recipient}`">[[ command.recipient ]]</a></td>
-                    <td> [[ command.state ]] </td>
+                    <td v-bind:class="['CMD_EXECUTED','CMD_PENDING','CMD_RUNNING'].includes(command.state) ? '' : 'red'"> [[ command.state ]] </td>
                     <td> [[ command.s_deposit_time]] </td>
                     <td> [[ command.r_read_time]]</td>
                     <td> [[ command.validity_duration]] </td>
@@ -199,7 +199,7 @@ def get_last_specific_cmds(agent_name):
                     time.sleep(0.5)
             return AgentCmd.objects.get(id=last_agent_specific_cmds.id) 
         except AgentCmd.DoesNotExist:
-            if (last_do_stop_cmd == None or not last_do_stop_cmd.exists()) and last_agent_specific_cmds != None:
+            if last_do_stop_cmd == None and last_agent_specific_cmds != None:
                 return last_agent_specific_cmds
             last_agent_specific_cmds = AgentCmd.send_cmd_from_to("System",agent_name,"get_specific_cmds")
             while not AgentCmd.objects.get(id=last_agent_specific_cmds.id).is_executed() and not AgentCmd.objects.get(id=last_agent_specific_cmds.id).is_exec_error():