1
0
Fork 0

Updated no telemetry data available display state and set default telemetry data date range to the previous week.

merge-requests/111/head
keikreutler 2017-01-04 18:55:03 +01:00 committed by Nikos Roussos
parent 7195157b0a
commit 46013fcc8a
No known key found for this signature in database
GPG Key ID: BADFF1767BA7C8E1
3 changed files with 19 additions and 13 deletions

View File

@ -278,10 +278,6 @@ footer {
/* Telemetry D3 visualisation
============================= */
.chart {
min-height: 500px;
}
.chart text {
color: #333;
font-size: 12px;

View File

@ -175,7 +175,9 @@ var TelemetryCollection = Backbone.Collection.extend({
var TelemetryDescriptors = TelemetryCollection.extend({
parse: function(response){
return response[0].appendix;
if(response.length !== 0) {
return response[0].appendix;
}
}
});
@ -213,6 +215,8 @@ var TelemetryChartView = Backbone.View.extend({
chartSelection: null,
initialize: function() {
this.collection.fetch();
this.updateDates(moment().subtract(7, 'days').format('YYYY/MM/DD'), moment().format('YYYY/MM/DD'));
this.renderPlaceholder();
this.collection.on('update filter', this.render, this);
chart = d3.lineChart();
},
@ -229,11 +233,14 @@ var TelemetryChartView = Backbone.View.extend({
.datum(data)
.call(d3.lineChart(data[0].appendix[0].key, data[0].appendix[0].unit));
} else {
$('#telemetry-descriptors').hide();
$('#data-available').html("<p>There is no data available for the selected dates.</p>");
d3.select('svg').remove();
this.renderPlaceholder();
}
},
renderPlaceholder: function() {
$('#telemetry-descriptors').hide();
$('#data-available').html("<p>There is no data available for the selected dates.</p>");
d3.select('svg').remove();
},
updateKey: function(e){
d3.select('svg').remove();
this.chartSelection.call(d3.lineChart($(e.currentTarget).data("key"), $(e.currentTarget).data("unit")));
@ -271,9 +278,12 @@ $('input[name="daterange"]').daterangepicker(
locale: {
format: 'YYYY/MM/DD'
},
startDate: '2016/04/29',
endDate: '2016/05/01',
"autoApply": true,
dateLimit: {
"days": 60
},
autoApply: true,
startDate: moment().subtract(7, 'days').format('YYYY/MM/DD'),
endDate: moment().format('YYYY/MM/DD'),
},
function(start, end, label) {
telemetryChartView.updateDates(start.format('YYYYMMDD'), end.format('YYYYMMDD'));

View File

@ -277,11 +277,11 @@
<div class="col-md-3 panel-satellite">
<div class="input-group datepicker">
<span class="input-group-addon">Date range</span>
<input type="text" name="daterange" value="01/01/2015 - 01/31/2015" />
<input type="text" name="daterange"/>
</div>
<ul id="telemetry-descriptors">
</ul>
<div id="data-available">
<div id="data-available" class="text-danger">
</div>
</div>
</div>