Commit 2f33318c78f3ea296ed8ac684e69d156a630554b
1 parent
3a4c6f16
Exists in
dev
add new fields in agent detail command list
Showing
3 changed files
with
12 additions
and
5 deletions
Show diff stats
CHANGELOG
src/core/pyros_django/dashboard/templates/dashboard/agent_detail.html
... | ... | @@ -137,13 +137,16 @@ |
137 | 137 | class="table table-bordered tablesorter" id="cmdtable"> |
138 | 138 | <thead> |
139 | 139 | <tr> |
140 | - <th>Command full name</th> | |
140 | + <th>Command</th> | |
141 | 141 | <th>Sender</th> |
142 | 142 | <th>Recipient</th> |
143 | 143 | <th>Status </th> |
144 | - <th>Deposit time (UTC)</th> | |
145 | - <th>Read time (UTC)</th> | |
146 | - <th>Validity Duration (s)</th> | |
144 | + <th>Deposit (UTC)</th> | |
145 | + <th>Read (UTC)</th> | |
146 | + <th>Validity (s)</th> | |
147 | + <th>Timeout (s)</th> | |
148 | + <th>Exec start (UTC)</th> | |
149 | + <th>Exec end (UTC)</th> | |
147 | 150 | <th>Result</th> |
148 | 151 | </tr> |
149 | 152 | </thead> |
... | ... | @@ -166,6 +169,9 @@ |
166 | 169 | <td> {{ command.s_deposit_time|date:"Y-m-d\TH:m:s" }} </td> |
167 | 170 | <td> {{ command.r_read_time|date:"Y-m-d\TH:m:s" }}</td> |
168 | 171 | <td> {{ command.validity_duration}} </td> |
172 | + <td> {{ command.exec_timeout}} </td> | |
173 | + <td> {{ command.r_start_time|date:"Y-m-d\TH:m:s" }} </td> | |
174 | + <td> {{ command.r_end_time|date:"Y-m-d\TH:m:s" }}</td> | |
169 | 175 | <td> {{ command.result }} </td> |
170 | 176 | </tr> |
171 | 177 | {% endfor %} |
... | ... |
src/core/pyros_django/dashboard/views.py
... | ... | @@ -266,7 +266,7 @@ def agent_detail(request, agent_name): |
266 | 266 | commands_recivied_by_agent = AgentCmd.get_commands_sent_to_agent(agent_name) |
267 | 267 | agent_cmds = commands_sent_by_agent | commands_recivied_by_agent |
268 | 268 | agent_cmds = agent_cmds.exclude(full_name="get_specific_cmds") |
269 | - agent_cmds = agent_cmds.order_by("-id") | |
269 | + agent_cmds = agent_cmds.order_by("-s_deposit_time") | |
270 | 270 | paginator = Paginator(agent_cmds, pyros_settings.NB_ELEMENT_PER_PAGE) |
271 | 271 | page_number = request.GET.get("page",1) |
272 | 272 | agent_general_commands = AgentCmd._AGENT_GENERAL_COMMANDS |
... | ... |