48k.eu-mirror
/
ogcp
mirror of https://git.48k.eu/ogcp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show last command result for clients in ogLive 

If the last command sent to a client/s finishes with errors, their icons
in the scopes tree change to a yellow circle with an times sign inside.
multi-ogserver
Javier Sánchez Parra 2022-05-11 17:32:10 +02:00
parent 08cae4b6ca
commit 4c6e3a90f1
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ogcp/static/js/ogcp.js
View File

@ -169,20 +169,25 @@ function updateScopes(scopes) {
if (scope.state) {
const scopeId = `${scope.name}_${scope.id}`.replaceAll(/[.]|[ ]/g, '_');
const iconEl = document.querySelector(`#${scopeId} .nav-icon`);
const iconCls = ['fas', 'far', 'text-danger', 'text-success',
const iconCls = ['fas', 'far', 'fa-circle', 'fa-check-circle',
'fa-times-circle', 'text-danger', 'text-success',
'text-warning', 'text-wol'];
iconEl.classList.remove(...iconCls);
let newIconCls = [];
if (scope.state === 'OPG') {
newIconCls.push('fas', 'text-warning');
if (scope.last_cmd.result === 'failure')
newIconCls.push('fa-times-circle');
else
newIconCls.push('fa-circle');
} else if (scope.state === 'BSY') {
newIconCls.push('fas', 'text-danger');
newIconCls.push('fas', 'fa-circle', 'text-danger');
} else if (scope.state === 'VDI') {
newIconCls.push('fas', 'text-success');
newIconCls.push('fas', 'fa-circle', 'text-success');
} else if (scope.state === 'WOL_SENT') {
newIconCls.push('fas', 'text-wol');
newIconCls.push('fas', 'fa-circle', 'text-wol');
} else {
newIconCls.push('far');
newIconCls.push('far', 'fa-circle');
}
iconEl.classList.add(...newIconCls);

2
ogcp/views.py
View File

@ -140,6 +140,8 @@ def add_state_and_ips(scope, clients, ips):
if client:
scope['state'] = client['state']
scope['link'] = client.get('speed')
scope['last_cmd'] = {}
scope['last_cmd']['result'] = client.get('last_cmd').get('result')
else:
scope['state'] = 'off'
scope['ip'] = [scope['ip']]