Commit 652d479b89b73a2e4526ea933f42b825e15b66fc
1 parent
fbd4597e
Exists in
dev
Adding titles, changes on css of agent detail, fix agentsst sender name
Showing
8 changed files
with
21 additions
and
13 deletions
Show diff stats
CHANGELOG
| 1 | +06-10-2022 (AKo): v0.6.0.0 | |
| 2 | + - Change typo in agent_detail, add agent state & mode, disabling button if agent not reachable | |
| 3 | + - Adding titles, changes on css of agent detail, fix agentsst sender name | |
| 4 | + | |
| 1 | 5 | 30-09-2022 (AKo): v0.5.7.0 |
| 2 | 6 | - AgentSST not longer restarting its agents if in test mode of soft mode in manual |
| 3 | 7 | - Fixing Agent's test_commands_list iteration | ... | ... |
VERSION
src/core/pyros_django/agent/AgentSST.py
| ... | ... | @@ -288,7 +288,7 @@ class AgentSST(Agent): |
| 288 | 288 | # cmd outdated if deposit time was between 25 and 30 seconds ago from now |
| 289 | 289 | # if last start cmd for this agent was executed and this agent isn't currently running, ask again a start. |
| 290 | 290 | if cmd_outdated_datetime_start >= last_executed_start_agent_cmd.first().s_deposit_time and cmd_outdated_datetime_end >= last_executed_start_agent_cmd.first().s_deposit_time: |
| 291 | - self.send_cmd_to("AgentSST","do_start_agent", agent) | |
| 291 | + self.send_cmd_to(self.name,"do_start_agent", agent) | |
| 292 | 292 | else: |
| 293 | 293 | try: |
| 294 | 294 | # Check if do_start_agent cmd already asked by agentSST in previous iterations and not exectuted. If the query success (no exception raised), we don't send again a cmd | ... | ... |
src/core/pyros_django/dashboard/templates/dashboard/agent_detail.html
| ... | ... | @@ -27,8 +27,12 @@ |
| 27 | 27 | .table{ |
| 28 | 28 | width:auto; |
| 29 | 29 | } |
| 30 | + h1{ | |
| 31 | + margin-bottom: 5vh; | |
| 32 | + } | |
| 30 | 33 | </style> |
| 31 | 34 | <div> |
| 35 | + <h1> {{ agent_name }} detail </h1> | |
| 32 | 36 | {% if managed_by %} |
| 33 | 37 | <p> This agent is managed by <a href="{% url 'agent_detail' managed_by %}">{{ managed_by }} </a></p> |
| 34 | 38 | {% endif %} |
| ... | ... | @@ -122,7 +126,7 @@ |
| 122 | 126 | </table> |
| 123 | 127 | </div> |
| 124 | 128 | {% endif %} |
| 125 | - <br><h1> Commands received & sent </h1><br> | |
| 129 | + <br><h1> Commands <span style="color:green;">received</span> & <span style="color:blue;">sent</span> </h1><br> | |
| 126 | 130 | {% if commands %} |
| 127 | 131 | <div> |
| 128 | 132 | <table | ... | ... |
src/core/pyros_django/dashboard/templates/dashboard/agents_state.html
src/core/pyros_django/obsconfig/templates/obsconfig/global_obs_configuration.html
| ... | ... | @@ -6,18 +6,18 @@ |
| 6 | 6 | <h1>{{obs_name}} </h1> |
| 7 | 7 | <ul> |
| 8 | 8 | <li> <a href=" {% url 'obs_config_help' %}"> How the observatory configuration works </a> </li> |
| 9 | - {% if CAN_EDIT_CONFIG %} | |
| 10 | - | |
| 11 | - <li> <a href="{% url 'edit_config' %}"> Edit observatory configuration </a> </li> | |
| 12 | - {% endif %} | |
| 13 | 9 | {% if CAN_VIEW_HARDWARE_CONFIG %} |
| 14 | - <li> <a href="{% url 'obs_hardware_config' %}"> Hardware configuration </a> </li> | |
| 10 | + <li> <a href="{% url 'obs_hardware_config' %}"> Hardware configuration </a> </li> | |
| 15 | 11 | {% endif %} |
| 16 | 12 | {% if CAN_VIEW_ASTRONOMER_CONFIG %} |
| 17 | - <li> <a href="{% url 'obs_astronomer_config' %}"> Astronomer configuration </a> </li> | |
| 13 | + <li> <a href="{% url 'obs_astronomer_config' %}"> Astronomer configuration </a> </li> | |
| 18 | 14 | {% endif %} |
| 19 | 15 | {% if CAN_VIEW_AGENTS_CONFIG %} |
| 20 | - <li> <a href="{% url 'obs_agents_config' %}"> Agents configuration </a> </li> | |
| 16 | + <li> <a href="{% url 'obs_agents_config' %}"> Agents configuration </a> </li> | |
| 17 | + {% endif %} | |
| 18 | + {% if CAN_EDIT_CONFIG %} | |
| 19 | + | |
| 20 | + <li> <a href="{% url 'edit_config' %}"> Edit observatory configuration </a> </li> | |
| 21 | 21 | {% endif %} |
| 22 | 22 | </ul> |
| 23 | 23 | {% comment %} | ... | ... |
src/core/pyros_django/obsconfig/templates/obsconfig/obs_agents_config.html