This commit is contained in:
dchen4
2024-12-12 18:31:56 +11:00
parent 548838a391
commit b13cdb9c09
3 changed files with 12 additions and 7 deletions

View File

@@ -7,7 +7,7 @@
<!-- dependencies -->
<link href="https://cdn.jsdelivr.net/npm/@coreui/coreui@5.2.0/dist/css/themes/bootstrap/bootstrap.min.css" rel="stylesheet" integrity="sha384-nQQlHXZO4YmST3YDqk/JU3f1t2D58a/nPd1QbiLecouKn68glzRym4BlOxlr5Rrg" crossorigin="anonymous">
</head>
<body style="background-color: #fffee0;">
<body style="background-color: #ffffff;">
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js" integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js" integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy" crossorigin="anonymous"></script>
<!--chartjs-->
@@ -169,8 +169,8 @@
<p>*Multiple choices in a given column for line graph will be averaged. Bar graph will be cumulative.</p>
</div>
<button type="button" class="btn btn-danger" onclick="queue_filter.clear()">Clear query queue</button>
<button type="button" class="btn btn-success" onclick="queue_filter.go()">Run!</button>
<button type="button" class="btn btn-danger" onclick="queue_filter.clear()">Clear</button>
<button type="button" class="btn btn-success" onclick="queue_filter.go()">Execute</button>
</script>
</div>
<br>
@@ -193,12 +193,17 @@
<div class="container">
<div class="row">
<div class="col-5">
<canvas id="pie_canvas"></canvas>
<div class="col-3">
</div>
<div class="col-5">
<div class="col-6">
<canvas id="pie_canvas"></canvas>
<br>
<canvas id="bar_canvas"></canvas>
</div>
<div class="col-1">
</div>
</div>
</div>
<br>

View File

@@ -396,7 +396,7 @@ class FilterQueue{
//formulate graph object
var graph_lst = []
for (var i=0; i<plotlst.length;i++){
graph_lst.push({"lineTension":0.8, label:"Query "+String(i+1), "data": plotlst[i], borderWidth:1})
graph_lst.push({"lineTension":0.3, label:"Query "+String(i+1), "data": plotlst[i], borderWidth:1})
}
var pie_lbl = [];

BIN
schema_diagram.pdf Normal file

Binary file not shown.