Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2025-06-13 12:54:29 +00:00
Code Issues Projects Releases Wiki Activity

label per-job build-time graph axes

Browse Source 
commonalize some js for configuring time axes
This commit is contained in:
Oliver Giles 2018-09-30 13:00:23 +03:00
parent 63301c73d9
commit 48854239a5
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/resources/js/app.js
View File

@ -15,6 +15,14 @@ Vue.filter('iecFileSize', function(bytes) {
['B', 'KiB', 'MiB', 'GiB', 'TiB'][exp]; ['B', 'KiB', 'MiB', 'GiB', 'TiB'][exp];
}); });
const timeScale = function(max){
return max > 3600
? { scale:function(v){return Math.round(v/360)/10}, label:'Hours' }
: max > 60
? { scale:function(v){return Math.round(v/60)/10}, label:'Minutes' }
: { scale:function(v){return v;}, label:'Seconds' };
}
const wsp = function(path) { const wsp = function(path) {
return new WebSocket((location.protocol === 'https:'?'wss://':'ws://') return new WebSocket((location.protocol === 'https:'?'wss://':'ws://')
+ location.host + path); + location.host + path);
@ -269,9 +277,7 @@ const Home = function() {
}}}]} }}}]}
} }
}); });
var tpjScale = function(max){ var tpjScale = timeScale(Math.max(Object.values(msg.timePerJob)));
return max > 3600 ? 3600 : max > 60 ? 60 : 1;
}(Math.max(Object.values(msg.timePerJob)));
chtTimePerJob = new Chart(document.getElementById("chartTpj"), { chtTimePerJob = new Chart(document.getElementById("chartTpj"), {
type: 'horizontalBar', type: 'horizontalBar',
data: { data: {
@ -284,18 +290,14 @@ const Home = function() {
}, },
options:{ options:{
scales:{xAxes:[{ scales:{xAxes:[{
ticks:{userCallback: (label, index, labels)=>{ ticks:{userCallback: tpjScale.scale},
return tpjScale == 1 ? label : Math.round(label/(tpjScale/10))/10;
}},
scaleLabel: { scaleLabel: {
display: true, display: true,
labelString: function(){ labelString: tpjScale.label
return tpjScale == 3600 ? 'Hours' : tpjScale == 60 ? 'Minutes' : 'Seconds';
}()
} }
}]}, }]},
tooltips:{callbacks:{label:(tip, data)=>{ tooltips:{callbacks:{label:(tip, data)=>{
return data.datasets[tip.datasetIndex].label + ': ' + tip.xLabel + (tpjScale == 3600 ? ' hours' : tpjScale == 60 ? ' minutes' : ' seconds'); return data.datasets[tip.datasetIndex].label + ': ' + tip.xLabel + ' ' + tpjScale.label.toLowerCase();
}}} }}}
} }
}); });
@ -345,9 +347,7 @@ const Home = function() {
} }
} }
}); });
var btcScale = function(max){ var btcScale = timeScale(Math.max(msg.buildTimeChanges.map((e)=>{return Math.max(e.durations)})));
return max > 3600 ? 3600 : max > 60 ? 60 : 1;
}(Math.max(msg.buildTimeChanges.map((e)=>{return Math.max(e.durations)})));
var chtBuildTimeChanges = new Chart(document.getElementById("chartBuildTimeChanges"), { var chtBuildTimeChanges = new Chart(document.getElementById("chartBuildTimeChanges"), {
type: 'line', type: 'line',
data: { data: {
@ -364,14 +364,10 @@ const Home = function() {
scales:{ scales:{
xAxes:[{ticks:{display: false}}], xAxes:[{ticks:{display: false}}],
yAxes:[{ yAxes:[{
ticks:{userCallback: (label, index, labels)=>{ ticks:{userCallback: btcScale.scale},
return btcScale == 1 ? label : Math.round(label/(btcScale/10))/10;
}},
scaleLabel: { scaleLabel: {
display: true, display: true,
labelString: function(){ labelString: btcScale.label
return btcScale == 3600 ? 'Hours' : btcScale == 60 ? 'Minutes' : 'Seconds';
}()
} }
}] }]
}, },
@ -562,6 +558,7 @@ var Job = function() {
// old chart and recreate it to prevent flickering of old data // old chart and recreate it to prevent flickering of old data
if(chtBt) if(chtBt)
chtBt.destroy(); chtBt.destroy();
var btScale = timeScale(Math.max(msg.recent.map(v=>{v.completed-v.started})));
chtBt = new Chart(document.getElementById("chartBt"), { chtBt = new Chart(document.getElementById("chartBt"), {
type: 'bar', type: 'bar',
data: { data: {
@ -599,8 +596,15 @@ var Job = function() {
display: false, display: false,
drawBorder: false drawBorder: false
} }
}],
yAxes:[{
ticks:{userCallback: btScale.scale},
scaleLabel:{display: true, labelString: btScale.label}
}] }]
} },
tooltips:{callbacks:{label:(tip, data)=>{
return data.datasets[tip.datasetIndex].label + ': ' + tip.yLabel + ' ' + btScale.label.toLowerCase();
}}}
} }
}); });