diff --git a/client/jsFiles/SEAWebClientMain.js b/client/jsFiles/SEAWebClientMain.js index f6d9849..0f99ccf 100644 --- a/client/jsFiles/SEAWebClientMain.js +++ b/client/jsFiles/SEAWebClientMain.js @@ -78,15 +78,16 @@ new Settings() .treat("lazyPermission", "wr", to_bool, true); +let args = ''; if (window.instrument) { - window.clientTags = "&instrument=" + window.instrument; + args += "&instrument=" + window.instrument; } else { let args = ''; if (window.stream) { args += "&stream=" + window.stream; } if (window.device) { args += "&device=" + window.device; } - if (window.hideRightPart) { args += "&history_only=1"; } - window.clientTags = args; } +if (window.hideRightPart) { args += "&history_only=1"; } +window.clientTags = args; // console.log('TAGS', window.clientTags); diff --git a/webserver.py b/webserver.py index 398dc4b..6277fce 100755 --- a/webserver.py +++ b/webserver.py @@ -115,7 +115,7 @@ class Server: app.debug = True - logging.basicConfig(filename='webserver.log', filemode='w', level=logging.INFO, + logging.basicConfig(filename='logifle.log', filemode='w', level=logging.INFO, format='%(asctime)s %(levelname)s %(message)s') # srv = gevent.wsgi.WSGIServer(('', port), app, keyfile='key.key', certfile='key.crt') @@ -357,13 +357,18 @@ a { '''] ONEMONTH = 30 * 24 * 3600 - prevtitle = [None] + class prev: # just a namesapce + title = None + legend = None def change_title(text): - if text == prevtitle[0]: + if text == prev.title: return False - prevtitle[0] = text - out.append(f'

{text}

') + if prev.legend: + out.append(f'{prev.legend}') + prev.legend = None + prev.title = text + out.append(f'
{text}:') return True # TODO: sort this by (instrument / device) and list dates @@ -390,6 +395,9 @@ a { if key[0] == 'instrument': ins = key[1] port = instruments.get(ins) + left = ins.upper() + else: + left = key[1] # shown in left column args = ['='.join(key)] remote = None if port is None else f'http://{ins}.psi.ch:{port}' history_only = bool(remote) @@ -398,29 +406,34 @@ a { daterange = f'since {time.strftime("%H:%M", time.localtime(beg))}' else: daterange = f'since {begdate}' - if change_title('currently running'): - out.append('instrumenthistory only') + change_title('currently running') else: + args.append(f'time={beg},{end}') history_only = True remote = None daterange = begdate if begdate == enddate else f'{begdate}...{enddate}' if end > now - ONEMONTH: - change_title('recently running') + change_title('recently running (history graphics only)') else: change_title('older than 30 days') if history_only: args.append('hr=1') - link = f'' + + def link(label): + return f'{label}' + label = " ".join(devices) if remote: - out.append(f'{ins.upper()}{link}{label}') + prev.legend = 'linse-c*: history graphics only' + out.append(f'{ins.upper()}' + f'{label}{link("linse-c*")}') else: - out.append(f'{link}{key[1]} {label}') + out.append(f'{link(left)}{label}') out.append(f'{daterange}') if timerange: out.append(f'

earlier dates


') out.append('') - out.append('

direct link to instruments:

') + out.append('
direct link to instruments:
') out.extend([f'{ins.upper()} \n' for ins, port in instruments.items()]) if server.db.has_local: