UI changes on agent detail & Handling badly nammed commands

Alexis Koralewski
1 parent 888d6d8e
Showing 5 changed files with 34 additions and 18 deletions Show diff stats
CHANGELOG
VERSION
src/core/pyros_django/api/serializers.py
src/core/pyros_django/api/views.py
src/core/pyros_django/dashboard/templates/dashboard/agent_detail.html
+21-10-2022 (AKo): v0.6.3.0
+	- UI changes on agent detail
+	- Handling badly nammed commands
+
 20-10-2022 (AKo): v0.6.2.1
 	- Add new field in cmd list (exec_time), fix issues with get_specific_cmds, try to improve performance of js script in agent_detail view
 	- Change import of agents
-0.6.2.1
 \ No newline at end of file
+0.6.3.0
 \ No newline at end of file
@@ -106,9 +106,9 @@ class AgentCmdSerializer(serializers.ModelSerializer):
     exec_time = serializers.SerializerMethodField()
     def get_exec_time(self,obj):
         try:
-            return obj.r_end_time - obj.r_start_time
+            return round((obj.r_end_time - obj.r_start_time).total_seconds(),2)
         except:
-            return "None"
+            return ""
  
 class AgentSurveySerializer(serializers.ModelSerializer):
     class Meta:
@@ -278,7 +278,7 @@ class AgentCmdViewSet(viewsets.ModelViewSet):
             commands_sent_by_agent = AgentCmd.get_commands_sent_by_agent(agent_name)
             commands_recivied_by_agent = AgentCmd.get_commands_sent_to_agent(agent_name)
             agent_cmds = commands_sent_by_agent | commands_recivied_by_agent
-            #agent_cmds = agent_cmds.exclude(full_name="get_specific_cmds")
+            agent_cmds = agent_cmds.exclude(full_name="get_specific_cmds")
             agent_cmds = agent_cmds.order_by("-s_deposit_time")
             if number:
                 number = int(number)
@@ -30,9 +30,17 @@
     .table{
        width:auto;
     }
-    .header{
+    th{
+        max-width: 15vw;
+        vertical-align:top;
         text-align: center;
     }
+    .theader{
+        text-align: center;
+        min-width:7vw;
+        max-width: 12vw;
+        vertical-align:top;
+    }
     #overflowtable{
         overflow-x: scroll;
     }
@@ -164,18 +172,18 @@
             class="table table-bordered tablesorter" id="cmdtable">
             <thead>
                 <tr>
-                    <th>Command</th>
-                    <th>Sender</th>
-                    <th>Recipient</th>
-                    <th>Status </th>
-                    <th>Deposit<br> (UTC)</th>
-                    <th>Read<br> (UTC)</th>
-                    <th>Validity<br> (s)</th>
-                    <th>Timeout<br> (s)</th>
-                    <th>Exec start <br>(UTC)</th>
-                    <th>Exec end <br>(UTC)</th>
-                    <th>Exec time <br>(s)</th>
-                    <th>Result</th>
+                    <th class="theader align-top">Command</th>
+                    <th class="theader align-top">Sender</th>
+                    <th class="theader align-top">Recipient</th>
+                    <th class="theader align-top">Status </th>
+                    <th class="theader align-top">Deposit<br> (UTC)</th>
+                    <th class="theader align-top">Read<br> (UTC)</th>
+                    <th class="theader align-top">Validity<br> (s)</th>
+                    <th class="theader align-top">Timeout<br> (s)</th>
+                    <th class="theader align-top">Exec start <br>(UTC)</th>
+                    <th class="theader align-top">Exec end <br>(UTC)</th>
+                    <th class="theader align-top">Exec time <br>(s)</th>
+                    <th class="theader align-top">Result</th>
                 </tr>
             </thead>
             <tbody>
@@ -320,7 +328,11 @@
                         if (arg_name == "U"){
                             $("<p></p>").text("This command isn't implemented").css("display","inline").appendTo("#additional_fields");
                             $("#send_cmd_btn").hide()
-                        }else{
+                        }else if (arg_name == "I"){
+                            $("<p></p>").text("This command is badly nammed. A command must start with \"do/get/set\"").css("display","inline").appendTo("#additional_fields");
+                            $("#send_cmd_btn").hide()
+                        }
+                        else{
                             $("#send_cmd_btn").show()
                             $("<label></label>").text(arg_name).appendTo("#additional_fields");