Commit 93beb237 authored by Patrick Godwin's avatar Patrick Godwin

tweaks so that new layout looks nice on example

parent b6f8f58b
......@@ -29,24 +29,18 @@ pages:
plots:
- plot: snr_by_ifo
grid: {x: 0, y: 0, h: 6, w: 6}
- plot: twoaxis
grid: {x: 0, y: 0, h: 6, w: 6}
- plot: multischema
grid: {x: 0, y: 0, h: 6, w: 6}
- plot: custom_opts
grid: {x: 0, y: 0, h: 6, w: 6}
- plot: snr_heatmap
grid: {x: 0, y: 0, h: 6, w: 6}
- plot: segment
grid: {x: 0, y: 0, h: 6, w: 6}
visible: true
- plot: heartbeat
grid: {x: 0, y: 0, h: 6, w: 6}
- plot: binned
grid: {x: 0, y: 0, h: 6, w: 6}
- plot: ifar
grid: {x: 0, y: 0, h: 6, w: 6}
grid: {x: 0, y: 6, h: 6, w: 6}
visible: true
- plot: segment
grid: {x: 6, y: 0, h: 6, w: 6}
visible: true
- plot: snr_heatmap
grid: {x: 6, y: 6, h: 6, w: 6}
visible: true
dash2:
dash2:
title: Example 2
type: grid
mode: online
......@@ -55,6 +49,19 @@ pages:
plots:
- plot: binned
grid: {x: 0, y: 0, h: 6, w: 6}
visible: true
- plot: multischema
grid: {x: 0, y: 6, h: 6, w: 6}
visible: true
- plot: custom_opts
grid: {x: 0, y: 12, h: 6, w: 6}
visible: true
- plot: twoaxis
grid: {x: 6, y: 0, h: 6, w: 6}
visible: true
- plot: ifar
grid: {x: 6, y: 6, h: 12, w: 6}
visible: true
#--------------------------------------------------------------
......@@ -70,6 +77,7 @@ schemas:
- H1
- L1
aggregate: median
default: 0
H1_snr:
measurement: inspiral
......@@ -142,6 +150,16 @@ schemas:
tag_key: job
aggregate: median
heartbeat:
backend: custom
measurement: latency
column: latency
tag: job
tag_key: job
aggregate: median
default: 1e4
transform: latency
latency:
backend: custom
measurement: latency
......@@ -149,22 +167,25 @@ schemas:
tag: job
tag_key: job
aggregate: median
default: 1e4
transform: none
segment:
schema:
segment:
column: segment
tag: job
tag_key: job
aggregate: median
timeseries:
name: "TimeSeries"
column: snr
tag: ifo
tag_key: ifo
ifo:
- "TimeSeries"
aggregate: median
segment:
measurement: segment
column: seg
tag: job
tag_key: job
aggregate: median
timeseries:
measurement: segment
name: "TimeSeries"
column: snr
tag: ifo
tag_key: ifo
ifo:
- "TimeSeries"
aggregate: median
ifar:
measurement: inspiral
......@@ -256,12 +277,13 @@ plots:
heartbeat:
title: Latest Heartbeat by Job
type: Bar
schema: inspiral
schema: heartbeat
layout:
xaxis: {title: {text: 'Job ID'}}
yaxis: {title: {text: 'Latency [s]'}}
- title: Sample IFAR Plot
ifar:
title: IFAR Plot + Table
type: IFAR
schema: ifar
layout:
......@@ -273,8 +295,9 @@ plots:
type: log
binned:
title: Sample SNR Bins Time Histogram
title: SNR Binned Time Histogram
type: BinnedTimeHistogram
schema: binned
layout:
yaxis: {title: {text: SNR}}
......
......@@ -18,8 +18,9 @@ import shutil
import bottle
import yaml
from .io import core
from . import utils
from .io import core
#-------------------------------------------------
### constants
......
......@@ -212,7 +212,7 @@ def serve_segment(measurement, start, end):
start,
end,
query.columns,
tags=tag_filters,
tags=query.tag_filters,
aggregate=query.aggregate,
dt=query.dt,
datetime=query.datetime
......
......@@ -89,6 +89,13 @@ body {
color: #495057;
}
.title {
color: #495057;
height: 50px;
display: inline-block;
font-size: 20px;
}
.unstyled-button{
border: none;
padding: 0;
......
......@@ -953,12 +953,8 @@ class TimeSegment extends _TimePlot{
this.script_name = script_name;
for (var key in this.schema) {
// Set a custom base URL for each schema measurement
if (this.schema[key].measurement) {
var base_url = new URL(`${script_name}api/${key}/${this.schema[key].measurement}/`, window.location.href);
delete this.schema[key].measurement;
} else {
var base_url = new URL(`${script_name}api/${key}/${this.measurement}/`, window.location.href);
}
var base_url = new URL(`${script_name}api/${key}/${this.schema[key].measurement}/`, window.location.href);
delete this.schema[key].measurement;
// Allow for custom data options for each schema
if (this.schema[key].data_options) {
......
......@@ -4,7 +4,7 @@
% if 'image' in dashboard_config:
<a class="navbar-brand mt-3 mt-lg-0" href="#"><img style="height:40px" src="{{ dashboard_config['image'] }}"></a>
% else:
<a class="navbar-brand mt-3 mt-lg-0" href="">{{ dashboard_config['title'] }}</a>
<a class="navbar-brand title mt-2" href="#">{{ dashboard_config['title'] }}</a>
% end
<b-navbar-toggle target="nav_collapse">
......@@ -21,7 +21,11 @@
% end
% for page in dashboard_config['pages']:
% if page == 'index':
% url = script_name if script_name[-1] != '/' else script_name[:-1]
% if script_name:
% url = script_name if script_name[-1] != '/' else script_name[:-1]
% else:
% url = '/'
% end
% else:
% url = script_name + page
% end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment